chore: resolve mr conflicts

Author: Fabian Stoehr

src/components/WindowThumbnailSettings.js

@@ -25,6 +25,7 @@ const ThumbnailOption = styled(MenuItem, { name: 'WindowThumbnailSettings', slot
       backgroundColor: `${(theme.vars || theme).palette.action.focus} !important`,
     },
     color: selected ? theme.palette.secondary.main : undefined,
+    display: 'inline-flex',
   },
 }));
 

src/components/WindowTopMenu.js

@@ -48,9 +48,9 @@ export function WindowTopMenu({
       open={open}
       role="menu"
     >
-      <WindowViewSettings windowId={windowId} handleClose={() => handleClose(anchorEl)} />
+      <WindowViewSettings windowId={windowId} handleClose={handleClose} />
       {showThumbnailNavigationSettings
-        && <WindowThumbnailSettings windowId={windowId} handleClose={() => handleClose(anchorEl)} />}
+        && <WindowThumbnailSettings windowId={windowId} handleClose={handleClose} />}
       <PluginHookWithHeader {...pluginProps} />
     </Popover>
   );