diff --git a/ChangeLog b/ChangeLog
index 44bd956a..766fa7cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-11-08  Markus Gans  <guru.mail@muenster.de>
+	* Activate the previous window in case if the menu is open and 
+	  the mouse click has activated no window.
+
 2015-11-07  Markus Gans  <guru.mail@muenster.de>
 	* Improved menu focus handling
 	* Menu supports newfont
diff --git a/src/fapp.cpp b/src/fapp.cpp
index 80b60750..cbf92d29 100644
--- a/src/fapp.cpp
+++ b/src/fapp.cpp
@@ -3,6 +3,7 @@
 
 #include "fapp.h"
 #include "fmenu.h"
+#include "fstatusbar.h"
 #include "fwindow.h"
 
 // global application object
@@ -973,6 +974,19 @@ void FApplication::processMouseEvent()
       menu->hide();
       menu->hideSubMenus();
       menu->hideSuperMenus();
+
+      // No widget was been clicked
+      if ( ! clicked_widget )
+      {
+        // activate previous window
+        FWindow::activatePrevWindow();
+        FWindow::getActiveWindow()->getFocusWidget()->setFocus();
+        FWindow::getActiveWindow()->redraw();
+        if ( statusBar() )
+          statusBar()->drawMessage();
+        updateTerminal();
+        flush_out();
+      }
     }
   }