diff --git a/rtgui/toolbar.cc b/rtgui/toolbar.cc
index c90677dcd..0d73a2579 100644
--- a/rtgui/toolbar.cc
+++ b/rtgui/toolbar.cc
@@ -207,8 +207,11 @@ bool ToolBar::handleShortcutKey (GdkEventKey* event) {
         switch(event->keyval) {
             case GDK_w:
             case GDK_W:
-                wb_pressed ();
-                return true;
+            	if(wbTool){
+					wb_pressed ();
+					return true;
+            	}
+				return false;
             case GDK_c:
             case GDK_C:
                 crop_pressed ();