1 files changed, 7 insertions, 11 deletions

diff --git a/src/callbacks.c b/src/callbacks.c
index 04bc2c3..5b66905 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -193,29 +193,25 @@ button_press_cb (GtkWidget* window, GdkEventButton* event) {
             sendev    = TRUE;
             propagate = TRUE;
         }
-
-        if(sendev) {
-            button_to_event(event->button, event->state, GDK_BUTTON_PRESS);
-        }
     }
 
     if(event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) {
         if(event->button == 1 && !(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE) && (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT)) {
             sendev    = TRUE;
-            propagate = TRUE;
+            propagate = uzbl.state.handle_multi_button;
         }
         else if(event->button == 2 && !(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE)) {
             sendev    = TRUE;
-            propagate = TRUE;
+            propagate = uzbl.state.handle_multi_button;
         }
-        else if(event->button > 3) {
+        else if(event->button >= 3) {
             sendev    = TRUE;
-            propagate = TRUE;
+            propagate = uzbl.state.handle_multi_button;
         }
+    }
 
-        if(sendev) {
-            button_to_event(event->button, event->state, event->type);
-        }
+    if(sendev) {
+        button_to_event(event->button, event->state, event->type);
     }
 
     return propagate;