diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index 0a29b8ada5..ba228442fa 100644
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -347,7 +347,7 @@ void wxPopupMenuWindow::SetCurrentItem(wxMenuItemIter node)
 
 void wxPopupMenuWindow::ChangeCurrent(wxMenuItemIter node)
 {
-    if ( !m_nodeCurrent || (node != m_nodeCurrent) )
+    if ( !m_nodeCurrent || !node || (node != m_nodeCurrent) )
     {
         wxMenuItemIter nodeOldCurrent = m_nodeCurrent;