diff --git a/electron/main.ts b/electron/main.ts
index e72c7f95a6..78577ac683 100644
--- a/electron/main.ts
+++ b/electron/main.ts
@@ -68,11 +68,7 @@ app
     } else {
       app.on('second-instance', (_event, _commandLine, _workingDirectory) => {
         // Someone tried to run a second instance, we should focus our window.
-        if (windowManager.mainWindow) {
-          if (windowManager.mainWindow.isMinimized())
-            windowManager.mainWindow.restore()
-          windowManager.mainWindow.focus()
-        }
+        windowManager.showMainWindow()
       })
     }
     app.on('activate', () => {
@@ -107,7 +103,12 @@ function createMainWindow() {
 
 function registerGlobalShortcuts() {
   const ret = registerShortcut(quickAskHotKey, (selectedText: string) => {
-    windowManager.showMainWindow()
+    if (!windowManager.isQuickAskWindowVisible()) {
+      windowManager.showQuickAskWindow()
+      windowManager.sendQuickAskSelectedText(selectedText)
+    } else {
+      windowManager.hideQuickAskWindow()
+    }
   })
 
   if (!ret) {
diff --git a/electron/managers/window.ts b/electron/managers/window.ts
index 796a5d54a7..eed80c37cf 100644
--- a/electron/managers/window.ts
+++ b/electron/managers/window.ts
@@ -101,6 +101,7 @@ class WindowManager {
   expandQuickAskWindow(heightOffset: number): void {
     const width = quickAskWindowConfig.width!
     const height = quickAskWindowConfig.height! + heightOffset
+    this._quickAskWindow?.setMinimumSize(width, height)
     this._quickAskWindow?.setSize(width, height, true)
   }