diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 4acce47518a625dc8c2dbcca5e0a3f004940c451..b38a1e7068e29bc586a7efa3f9b43d26c7b5ea60 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -4068,17 +4068,20 @@ thunar_window_button_press_event (GtkWidget      *view,
 
   _thunar_return_val_if_fail (THUNAR_IS_WINDOW (window), FALSE);
 
-  if (G_UNLIKELY (event->button == 8))
+  if (event->type == GDK_BUTTON_PRESS)
     {
-      action_entry = get_action_entry (THUNAR_WINDOW_ACTION_BACK);
-      ((void(*)(GtkWindow*))action_entry->callback)(GTK_WINDOW (window));
-      return GDK_EVENT_STOP;
-    }
-  if (G_UNLIKELY (event->button == 9))
-    {
-      action_entry = get_action_entry (THUNAR_WINDOW_ACTION_FORWARD);
-      ((void(*)(GtkWindow*))action_entry->callback)(GTK_WINDOW (window));
-      return GDK_EVENT_STOP;
+      if (G_UNLIKELY (event->button == 8))
+        {
+          action_entry = get_action_entry (THUNAR_WINDOW_ACTION_BACK);
+          ((void(*)(GtkWindow*))action_entry->callback)(GTK_WINDOW (window));
+          return GDK_EVENT_STOP;
+        }
+      if (G_UNLIKELY (event->button == 9))
+        {
+          action_entry = get_action_entry (THUNAR_WINDOW_ACTION_FORWARD);
+          ((void(*)(GtkWindow*))action_entry->callback)(GTK_WINDOW (window));
+          return GDK_EVENT_STOP;
+        }
     }
 
   return GDK_EVENT_PROPAGATE;