diff --git a/src/ui/components/hooks/useServers.ts b/src/ui/components/hooks/useServers.ts
index 61ea273d56..135a99ab44 100644
--- a/src/ui/components/hooks/useServers.ts
+++ b/src/ui/components/hooks/useServers.ts
@@ -1,9 +1,10 @@
 import { useSelector } from 'react-redux';
 import { createSelector } from 'reselect';
 
+import { Server } from '../../../servers/common';
 import { RootState } from '../../../store/rootReducer';
 // TODO: change currentView.url string to URL type
-export const useServers = () =>
+export const useServers = (): (Server & { selected: boolean })[] =>
   useSelector(
     createSelector(
       ({ currentView }: RootState) => currentView,
diff --git a/src/ui/main/menuBar.ts b/src/ui/main/menuBar.ts
index 5d43089f11..428a45a7a6 100644
--- a/src/ui/main/menuBar.ts
+++ b/src/ui/main/menuBar.ts
@@ -582,6 +582,7 @@ const createHelpMenu = createSelector(
       {
         id: 'toggleDevTools',
         label: t('menus.toggleDevTools'),
+        accelerator: 'CommandOrControl+Shift+D',
         click: async () => {
           const browserWindow = await getRootWindow();
 
diff --git a/src/ui/main/rootWindow.ts b/src/ui/main/rootWindow.ts
index 00a327f0c4..32d6e6b12f 100644
--- a/src/ui/main/rootWindow.ts
+++ b/src/ui/main/rootWindow.ts
@@ -54,13 +54,16 @@ export const getRootWindow = (): Promise<BrowserWindow> =>
     });
   });
 
+const platformTitleBarStyle =
+  process.platform === 'darwin' ? 'hidden' : 'default';
+
 export const createRootWindow = (): void => {
   _rootWindow = new BrowserWindow({
     width: 1000,
     height: 600,
     minWidth: 400,
     minHeight: 400,
-    titleBarStyle: 'hidden',
+    titleBarStyle: platformTitleBarStyle,
     backgroundColor: '#2f343d',
     show: false,
     webPreferences,