1 files changed, 9 insertions, 5 deletions

diff --git a/src/Window.cc b/src/Window.cc
index a4f6341..56c78c7 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2460,11 +2460,15 @@ void FluxboxWindow::buttonReleaseEvent(XButtonEvent &re) {
         stopResizing();
     else if (m_attaching_tab)
         attachTo(re.x_root, re.y_root);
-    else if (!frame().tabcontainer().tryButtonReleaseEvent(re)) {
-
-        if (m_last_button_x == re.x_root && m_last_button_y == re.y_root) {
-            Fluxbox::instance()->keys()->doAction(re.type, re.state, re.button, Keys::ON_WINDOW, &winClient(), re.time);
-        }
+    else if (m_last_button_x == re.x_root && m_last_button_y == re.y_root) {
+        int context = 0;
+        context = frame().getContext(re.subwindow ? re.subwindow : re.window,
+                                     re.x_root, re.y_root);
+        if (!context && re.subwindow)
+            context = frame().getContext(re.window);
+
+        Fluxbox::instance()->keys()->doAction(re.type, re.state, re.button,
+                                              context, &winClient(), re.time);
     }
 }