diff --git a/events.cpp b/events.cpp
index d9c450ab01..e3d201abd8 100644
--- a/events.cpp
+++ b/events.cpp
@@ -372,15 +372,17 @@ bool Workspace::workspaceEvent( XEvent * e )
             break;
             }
         case EnterNotify:
-            if ( QWhatsThis::inWhatsThisMode() )
             {
-            QWidget* w = QWidget::find( e->xcrossing.window );
-            if ( w )
-                QWhatsThis::leaveWhatsThisMode();
-            }
-
+            if ( QWhatsThis::inWhatsThisMode() )
+                {
+                QWidget* w = QWidget::find( e->xcrossing.window );
+                if ( w )
+                    QWhatsThis::leaveWhatsThisMode();
+                }
             if( electricBorder(e))
                 return true;
+            break;
+            }
         case LeaveNotify:
             {
             if ( !QWhatsThis::inWhatsThisMode() )