diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index 223e4ca203..77a03de14e 100644
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -369,7 +369,13 @@ void wxPopupMenuWindow::ChangeCurrent(wxMenuItemIter node)
         }
 
         if ( m_nodeCurrent )
-            RefreshItem(m_nodeCurrent->GetData());
+        {
+            wxMenuItem *item = m_nodeCurrent->GetData();
+            if ( item && item->GetMenu()->IsShown() )
+            {
+                RefreshItem(m_nodeCurrent->GetData());
+            }
+        }
     }
 }