diff --git a/Changelog b/Changelog
index 887cd84a0..0601d5706 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+* Unknown - Christophe Dumez <chris@qbittorrent.org> - v0.9.2
+		- BUGFIX: Window can now stay maximized on exit
+
 * Wed Apr 04 2007 - Christophe Dumez <chris@qbittorrent.org> - v0.9.1
     - BUGFIX: A lot of fixes in configure file
 
diff --git a/src/GUI.cpp b/src/GUI.cpp
index 926dc643c..f8a943ced 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -816,7 +816,8 @@ void GUI::closeEvent(QCloseEvent *e){
   }
   if(settings.value("Options/Misc/Behaviour/ConfirmOnExit", true).toBool()){
     show();
-    showNormal();
+		if(!isMaximized())
+	    showNormal();
     if(QMessageBox::question(this,
        tr("Are you sure you want to quit?")+" -- "+tr("qBittorrent"),
        tr("Are you sure you want to quit qBittorrent?"),