diff --git a/input.c b/input.c
index 462cbf32..9f57307b 100644
--- a/input.c
+++ b/input.c
@@ -877,19 +877,18 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
         break;
 
     case TERM_SURF_TITLE:
-        if (button == BTN_LEFT && state == WL_POINTER_BUTTON_STATE_PRESSED)
-            xdg_toplevel_move(term->window->xdg_toplevel, term->wl->seat, serial);
-        else if (button == BTN_RIGHT && state == WL_POINTER_BUTTON_STATE_PRESSED) {
-            if (term->window->is_maximized) {
-                LOG_INFO("UNsetting maximized");
-                xdg_toplevel_unset_maximized(term->window->xdg_toplevel);
-            } else {
-                LOG_INFO("setting maximized");
-                xdg_toplevel_set_maximized(term->window->xdg_toplevel);
+        if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
+
+            /* Toggle maximized state on double-click */
+            if (button == BTN_LEFT && wayl->mouse.count == 2) {
+                if (term->window->is_maximized)
+                    xdg_toplevel_unset_maximized(term->window->xdg_toplevel);
+                else
+                    xdg_toplevel_set_maximized(term->window->xdg_toplevel);
             }
-        } else if (button == BTN_MIDDLE && state == WL_POINTER_BUTTON_STATE_PRESSED) {
-            LOG_INFO("setting minimized");
-            xdg_toplevel_set_minimized(term->window->xdg_toplevel);
+
+            else if (button == BTN_LEFT)
+                xdg_toplevel_move(term->window->xdg_toplevel, term->wl->seat, serial);
         }
         return;