diff --git a/src/autotype/x11/AutoTypeX11.cpp b/src/autotype/x11/AutoTypeX11.cpp
index 7f26aa08f..6a20a88ff 100644
--- a/src/autotype/x11/AutoTypeX11.cpp
+++ b/src/autotype/x11/AutoTypeX11.cpp
@@ -208,7 +208,7 @@ int AutoTypePlatformX11::platformEventFilter(void* event)
             && m_currentGlobalKey
             && xevent->xkey.keycode == m_currentGlobalKeycode
             && (xevent->xkey.state & m_modifierMask) == m_currentGlobalNativeModifiers
-            && !QApplication::focusWidget()
+            && (!QApplication::activeWindow() || QApplication::activeWindow()->isMinimized())
             && m_loaded) {
         if (xevent->type == KeyPress) {
             Q_EMIT globalShortcutTriggered();
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 7e8e702ba..94cdf2124 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -575,10 +575,11 @@ void MainWindow::trayIconTriggered(QSystemTrayIcon::ActivationReason reason)
 
 void MainWindow::toggleWindow()
 {
-    if (QApplication::activeWindow() == this) {
+    if ((QApplication::activeWindow() == this) && isVisible() && !isMinimized()) {
         hide();
     }
     else {
+        ensurePolished();
         setWindowState(windowState() & ~Qt::WindowMinimized);
         show();
         raise();