diff --git a/ChangeLog b/ChangeLog
index 6327e7f6..60d67e7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 (Format: Year/Month/Day)
 Changes for 0.9.15:
+   * Click of LeftMouseButton should always setInputFocus (thanx Eike von Seggern)
+     solves problem with focus changes via key and then not beeing
+     able to focus the window underneath the mouse with a simple
+     click in MouseFocus mode
+     src/Window.cc
    * Use fbsetroot in Default-Styles (Mathias)
      data/styles/*
 -------------------------------------------------------------   
diff --git a/src/Window.cc b/src/Window.cc
index 35794ef2..9485a299 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2647,7 +2647,7 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent &be) {
     frame().buttonPressEvent(be);
 
     if (be.button == 1 || (be.button == 3 && be.state == Mod1Mask)) {
-        if ((! focused) && (! screen().isMouseFocus())) { //check focus
+        if ((! focused) ) {
             setInputFocus();
         }