diff --git a/Applications/PaintBrush/EllipseTool.cpp b/Applications/PaintBrush/EllipseTool.cpp
index 8169207491..6c69e4e41b 100644
--- a/Applications/PaintBrush/EllipseTool.cpp
+++ b/Applications/PaintBrush/EllipseTool.cpp
@@ -108,7 +108,7 @@ void EllipseTool::on_keydown(GUI::KeyEvent& event)
     }
 }
 
-void EllipseTool::on_contextmenu(GUI::ContextMenuEvent& event)
+void EllipseTool::on_tool_button_contextmenu(GUI::ContextMenuEvent& event)
 {
     if (!m_context_menu) {
         m_context_menu = GUI::Menu::construct();
diff --git a/Applications/PaintBrush/EllipseTool.h b/Applications/PaintBrush/EllipseTool.h
index e3a4a47b96..e3c8d79047 100644
--- a/Applications/PaintBrush/EllipseTool.h
+++ b/Applications/PaintBrush/EllipseTool.h
@@ -40,7 +40,7 @@ public:
     virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
     virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
     virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_contextmenu(GUI::ContextMenuEvent&) override;
+    virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
     virtual void on_second_paint(const Layer&, GUI::PaintEvent&) override;
     virtual void on_keydown(GUI::KeyEvent&) override;
 
diff --git a/Applications/PaintBrush/EraseTool.cpp b/Applications/PaintBrush/EraseTool.cpp
index 992183091e..4c1c641617 100644
--- a/Applications/PaintBrush/EraseTool.cpp
+++ b/Applications/PaintBrush/EraseTool.cpp
@@ -72,7 +72,7 @@ void EraseTool::on_mousemove(Layer& layer, GUI::MouseEvent& event, GUI::MouseEve
     }
 }
 
-void EraseTool::on_contextmenu(GUI::ContextMenuEvent& event)
+void EraseTool::on_tool_button_contextmenu(GUI::ContextMenuEvent& event)
 {
     if (!m_context_menu) {
         m_context_menu = GUI::Menu::construct();
diff --git a/Applications/PaintBrush/EraseTool.h b/Applications/PaintBrush/EraseTool.h
index f610a80220..cdb354f339 100644
--- a/Applications/PaintBrush/EraseTool.h
+++ b/Applications/PaintBrush/EraseTool.h
@@ -40,7 +40,7 @@ public:
 
     virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
     virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_contextmenu(GUI::ContextMenuEvent&) override;
+    virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
 
 private:
     Gfx::Color get_color() const;
diff --git a/Applications/PaintBrush/LineTool.cpp b/Applications/PaintBrush/LineTool.cpp
index 47db6e2437..7c0c44163f 100644
--- a/Applications/PaintBrush/LineTool.cpp
+++ b/Applications/PaintBrush/LineTool.cpp
@@ -128,7 +128,7 @@ void LineTool::on_keyup(GUI::KeyEvent& event)
     }
 }
 
-void LineTool::on_contextmenu(GUI::ContextMenuEvent& event)
+void LineTool::on_tool_button_contextmenu(GUI::ContextMenuEvent& event)
 {
     if (!m_context_menu) {
         m_context_menu = GUI::Menu::construct();
diff --git a/Applications/PaintBrush/LineTool.h b/Applications/PaintBrush/LineTool.h
index 0d5c0a683b..218cc09c23 100644
--- a/Applications/PaintBrush/LineTool.h
+++ b/Applications/PaintBrush/LineTool.h
@@ -40,7 +40,7 @@ public:
     virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
     virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
     virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_contextmenu(GUI::ContextMenuEvent&) override;
+    virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
     virtual void on_second_paint(const Layer&, GUI::PaintEvent&) override;
     virtual void on_keydown(GUI::KeyEvent&) override;
     virtual void on_keyup(GUI::KeyEvent&) override;
diff --git a/Applications/PaintBrush/PenTool.cpp b/Applications/PaintBrush/PenTool.cpp
index 8254acb8e1..c80a84e38f 100644
--- a/Applications/PaintBrush/PenTool.cpp
+++ b/Applications/PaintBrush/PenTool.cpp
@@ -73,7 +73,7 @@ void PenTool::on_mousemove(Layer& layer, GUI::MouseEvent& event, GUI::MouseEvent
     m_last_drawing_event_position = event.position();
 }
 
-void PenTool::on_contextmenu(GUI::ContextMenuEvent& event)
+void PenTool::on_tool_button_contextmenu(GUI::ContextMenuEvent& event)
 {
     if (!m_context_menu) {
         m_context_menu = GUI::Menu::construct();
diff --git a/Applications/PaintBrush/PenTool.h b/Applications/PaintBrush/PenTool.h
index 432410ba38..38d2ae9450 100644
--- a/Applications/PaintBrush/PenTool.h
+++ b/Applications/PaintBrush/PenTool.h
@@ -40,7 +40,7 @@ public:
     virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
     virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
     virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_contextmenu(GUI::ContextMenuEvent&) override;
+    virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
 
 private:
     virtual const char* class_name() const override { return "PenTool"; }
diff --git a/Applications/PaintBrush/RectangleTool.cpp b/Applications/PaintBrush/RectangleTool.cpp
index 09547ff4f6..f9befddd84 100644
--- a/Applications/PaintBrush/RectangleTool.cpp
+++ b/Applications/PaintBrush/RectangleTool.cpp
@@ -114,7 +114,7 @@ void RectangleTool::on_keydown(GUI::KeyEvent& event)
     }
 }
 
-void RectangleTool::on_contextmenu(GUI::ContextMenuEvent& event)
+void RectangleTool::on_tool_button_contextmenu(GUI::ContextMenuEvent& event)
 {
     if (!m_context_menu) {
         m_context_menu = GUI::Menu::construct();
diff --git a/Applications/PaintBrush/RectangleTool.h b/Applications/PaintBrush/RectangleTool.h
index ce0e7039da..882d8bd918 100644
--- a/Applications/PaintBrush/RectangleTool.h
+++ b/Applications/PaintBrush/RectangleTool.h
@@ -40,7 +40,7 @@ public:
     virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
     virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
     virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_contextmenu(GUI::ContextMenuEvent&) override;
+    virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
     virtual void on_second_paint(const Layer&, GUI::PaintEvent&) override;
     virtual void on_keydown(GUI::KeyEvent&) override;
 
diff --git a/Applications/PaintBrush/SprayTool.cpp b/Applications/PaintBrush/SprayTool.cpp
index 160d641f33..f3de797d5f 100644
--- a/Applications/PaintBrush/SprayTool.cpp
+++ b/Applications/PaintBrush/SprayTool.cpp
@@ -103,7 +103,7 @@ void SprayTool::on_mouseup(Layer&, GUI::MouseEvent&, GUI::MouseEvent&)
     m_timer->stop();
 }
 
-void SprayTool::on_contextmenu(GUI::ContextMenuEvent& event)
+void SprayTool::on_tool_button_contextmenu(GUI::ContextMenuEvent& event)
 {
     if (!m_context_menu) {
         m_context_menu = GUI::Menu::construct();
diff --git a/Applications/PaintBrush/SprayTool.h b/Applications/PaintBrush/SprayTool.h
index 5a4f2ba75b..4d9cdfe874 100644
--- a/Applications/PaintBrush/SprayTool.h
+++ b/Applications/PaintBrush/SprayTool.h
@@ -41,7 +41,7 @@ public:
     virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
     virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
     virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_contextmenu(GUI::ContextMenuEvent&) override;
+    virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
 
 private:
     virtual const char* class_name() const override { return "SprayTool"; }
diff --git a/Applications/PaintBrush/Tool.h b/Applications/PaintBrush/Tool.h
index 2058307a42..9bfa12d084 100644
--- a/Applications/PaintBrush/Tool.h
+++ b/Applications/PaintBrush/Tool.h
@@ -43,7 +43,7 @@ public:
     virtual void on_mousedown(Layer&, GUI::MouseEvent&, GUI::MouseEvent&) {}
     virtual void on_mousemove(Layer&, GUI::MouseEvent&, GUI::MouseEvent&) {}
     virtual void on_mouseup(Layer&, GUI::MouseEvent&, GUI::MouseEvent&) {}
-    virtual void on_contextmenu(GUI::ContextMenuEvent&) {}
+    virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) {}
     virtual void on_second_paint(const Layer&, GUI::PaintEvent&) {}
     virtual void on_keydown(GUI::KeyEvent&) {}
     virtual void on_keyup(GUI::KeyEvent&) {}
diff --git a/Applications/PaintBrush/ToolboxWidget.cpp b/Applications/PaintBrush/ToolboxWidget.cpp
index 28a2a1e24e..61be4860ab 100644
--- a/Applications/PaintBrush/ToolboxWidget.cpp
+++ b/Applications/PaintBrush/ToolboxWidget.cpp
@@ -75,7 +75,7 @@ public:
     virtual void context_menu_event(GUI::ContextMenuEvent& event) override
     {
         m_action->activate();
-        m_tool->on_contextmenu(event);
+        m_tool->on_tool_button_contextmenu(event);
     }
 
 private: