diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp
index c995466a66..774c5d5a75 100644
--- a/src/univ/toolbar.cpp
+++ b/src/univ/toolbar.cpp
@@ -652,7 +652,7 @@ bool wxStdToolbarInputHandler::HandleMouse(wxInputConsumer *consumer,
     wxToolBar *tbar = wxStaticCast(consumer->GetInputWindow(), wxToolBar);
     wxToolBarToolBase *tool = tbar->FindToolForPosition(event.GetX(), event.GetY());
 
-    if ( tool && !tool->IsEnabled() )
+    if ( !tool || !tool->IsEnabled() )
         return TRUE;
 
     return wxStdButtonInputHandler::HandleMouse(consumer, event);