--- a/Framework/Widgets/WorldSceneWidget.cpp	Wed Oct 17 19:38:39 2018 +0200
+++ b/Framework/Widgets/WorldSceneWidget.cpp	Wed Oct 17 19:42:56 2018 +0200
@@ -161,18 +161,23 @@
     {
       return new SceneMouseTracker(view_, tracker.release());
     }
-
-    //TODO: allow Interactor to create Pan & Zoom
-    switch (button)
+    else if (hasDefaultMouseEvents_)
     {
-      case MouseButton_Middle:
-        return new SceneMouseTracker(view_, new PanMouseTracker(*this, x, y));
+      switch (button)
+      {
+        case MouseButton_Middle:
+          return new SceneMouseTracker(view_, new PanMouseTracker(*this, x, y));
+
+        case MouseButton_Right:
+          return new SceneMouseTracker(view_, new ZoomMouseTracker(*this, x, y));
 
-      case MouseButton_Right:
-        return new SceneMouseTracker(view_, new ZoomMouseTracker(*this, x, y));
-
-      default:
-        return NULL;
+        default:
+          return NULL;
+      }      
+    }
+    else
+    {
+      return NULL;
     }
   }