diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 55b6109a9b..6146b45ac6 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -375,6 +375,12 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
         // Have we come to the last or first item on the panel?
         if ( !node )
         {
+            if ( !start_node )
+            {
+                // exit now as otherwise we'd loop forever
+                break;
+            }
+
             if ( !goingDown )
             {
                 // Check if our (maybe grand) parent is another panel: if this