diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 8fd60cc9a..bd1e60840 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -300,6 +300,7 @@ MainWindow::MainWindow(QWidget *parent)
     , m_commandDialog(NULL)
     , m_canUpdateTitleFromScript(true)
     , m_iconSnip(false)
+    , m_wasMaximized(false)
 {
     ui->setupUi(this);
     menuBar()->setObjectName("menu_bar");
@@ -1476,6 +1477,8 @@ bool MainWindow::event(QEvent *event)
         m_lastWindow.clear();
         updateWindowTransparency();
         setHideTabs(m_options.hideTabs);
+    } else if (type == QEvent::Hide) {
+        m_wasMaximized = isMaximized();
     }
 
     return QMainWindow::event(event);
@@ -1615,7 +1618,10 @@ void MainWindow::showWindow()
 
     updateFocusWindows();
 
-    showNormal();
+    if (m_wasMaximized)
+        showMaximized();
+    else
+        showNormal();
     raise();
     activateWindow();
 
diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index f6622e0d4..76418e795 100644
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -590,6 +590,8 @@ private slots:
     bool m_canUpdateTitleFromScript;
 
     bool m_iconSnip;
+
+    bool m_wasMaximized;
 };
 
 #endif // MAINWINDOW_H