diff --git a/ChangeLog b/ChangeLog
index 212512bb..aa8cfae7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2016-07-10  Markus Gans  <guru.mail@muenster.de>
 	* Remove obsolete code from FDialog destructor
+	* FDialog focus fix
 
 2016-07-08  Markus Gans  <guru.mail@muenster.de>
 	* Better code readability: control structures (if/else, while, switch) 
diff --git a/src/fdialog.cpp b/src/fdialog.cpp
index 67fe41fc..15a8758d 100644
--- a/src/fdialog.cpp
+++ b/src/fdialog.cpp
@@ -554,7 +554,7 @@ void FDialog::onMouseDown (FMouseEvent* ev)
       FWidget* old_focus = FWidget::getFocusWidget();
       setActiveWindow(this);
 
-      if ( focus_widget )
+      if ( focus_widget && numOfFocusableChildren() > 1 )
       {
         focus_widget->setFocus();
         focus_widget->redraw();
@@ -607,7 +607,7 @@ void FDialog::onMouseDown (FMouseEvent* ev)
         FWidget* old_focus = FWidget::getFocusWidget();
         setActiveWindow(this);
 
-        if ( focus_widget )
+        if ( focus_widget && numOfFocusableChildren() > 1 )
         {
           focus_widget->setFocus();
           focus_widget->redraw();
@@ -638,7 +638,7 @@ void FDialog::onMouseDown (FMouseEvent* ev)
         FWidget* old_focus = FWidget::getFocusWidget();
         setActiveWindow(this);
 
-        if ( focus_widget )
+        if ( focus_widget && numOfFocusableChildren() > 1 )
         {
           focus_widget->setFocus();
           focus_widget->redraw();
diff --git a/src/fmenubar.cpp b/src/fmenubar.cpp
index 5dc0cf53..c9c70692 100644
--- a/src/fmenubar.cpp
+++ b/src/fmenubar.cpp
@@ -767,9 +767,9 @@ void FMenuBar::onMouseUp (FMouseEvent* ev)
               redraw();
             }
           }
-
-          ++iter;
         }
+
+        ++iter;
       }
 
       if ( ! hasSelectedItem() )