diff --git a/ui/formwidgets.cpp b/ui/formwidgets.cpp
index 290bb5658..8e1569adc 100644
--- a/ui/formwidgets.cpp
+++ b/ui/formwidgets.cpp
@@ -328,7 +328,11 @@ void FormWidgetIface::moveTo( int x, int y )

 bool FormWidgetIface::setVisibility( bool visible )
 {
-    bool hadfocus = m_widget->hasFocus();
+    const bool hadfocus = m_widget->hasFocus();
+
+    if ( visible == m_widget->isVisible() )
+        return hadfocus;
+
     if ( hadfocus )
         m_widget->clearFocus();
     m_widget->setVisible( visible );