diff --git a/apps/opencs/view/widget/modebutton.cpp b/apps/opencs/view/widget/modebutton.cpp
index 7c62f6bb1..88f050247 100644
--- a/apps/opencs/view/widget/modebutton.cpp
+++ b/apps/opencs/view/widget/modebutton.cpp
@@ -7,3 +7,8 @@ CSVWidget::ModeButton::ModeButton (const QIcon& icon, const QString& tooltip, QW
 void CSVWidget::ModeButton::activate (SceneToolbar *toolbar) {}
 
 void CSVWidget::ModeButton::deactivate (SceneToolbar *toolbar) {}
+
+bool CSVWidget::ModeButton::createContextMenu (QMenu *menu)
+{
+    return false;
+}
diff --git a/apps/opencs/view/widget/modebutton.hpp b/apps/opencs/view/widget/modebutton.hpp
index ac14afc95..1615ff298 100644
--- a/apps/opencs/view/widget/modebutton.hpp
+++ b/apps/opencs/view/widget/modebutton.hpp
@@ -3,6 +3,8 @@
 
 #include "pushbutton.hpp"
 
+class QMenu;
+
 namespace CSVWidget
 {
     class SceneToolbar;
@@ -22,6 +24,14 @@ namespace CSVWidget
 
             /// Default-Implementation: do nothing
             virtual void deactivate (SceneToolbar *toolbar);
+
+            /// Add context menu items to \a menu. Default-implementation: return false
+            ///
+            /// \attention menu can be a 0-pointer
+            ///
+            /// \return Have there been any menu items to be added (if menu is 0 and there
+            /// items to be added, the function must return true anyway.
+            virtual bool createContextMenu (QMenu *menu);
     };
 }
 
diff --git a/apps/opencs/view/widget/scenetoolmode.cpp b/apps/opencs/view/widget/scenetoolmode.cpp
index efb508f9d..125f4ac79 100644
--- a/apps/opencs/view/widget/scenetoolmode.cpp
+++ b/apps/opencs/view/widget/scenetoolmode.cpp
@@ -18,6 +18,9 @@ void CSVWidget::SceneToolMode::contextMenuEvent (QContextMenuEvent *event)
 
 bool CSVWidget::SceneToolMode::createContextMenu (QMenu *menu)
 {
+    if (mCurrent)
+        return mCurrent->createContextMenu (menu);
+
     return false;
 }
 
diff --git a/apps/opencs/view/widget/scenetoolmode.hpp b/apps/opencs/view/widget/scenetoolmode.hpp
index 43cd4a7d7..3aa8e6799 100644
--- a/apps/opencs/view/widget/scenetoolmode.hpp
+++ b/apps/opencs/view/widget/scenetoolmode.hpp
@@ -32,7 +32,8 @@ namespace CSVWidget
 
             virtual void contextMenuEvent (QContextMenuEvent *event);
 
-            /// Add context menu items to \a menu. Default-implementation: return false
+            /// Add context menu items to \a menu. Default-implementation: Pass on request to
+            /// current mode button or return false, if there is no current mode button.
             ///
             /// \attention menu can be a 0-pointer
             ///