diff --git a/src/input_handler.cc b/src/input_handler.cc
index 07211c30..b48edce9 100644
--- a/src/input_handler.cc
+++ b/src/input_handler.cc
@@ -92,7 +92,8 @@ struct MouseHandler
         Buffer& buffer = context.buffer();
         BufferCoord cursor;
         auto& selections = context.selections();
-        switch (key.modifiers)
+        constexpr auto modifiers = Key::Modifiers::Control | Key::Modifiers::Alt | Key::Modifiers::Shift;
+        switch ((key.modifiers & ~modifiers).value)
         {
         case Key::Modifiers::MousePressRight:
             m_dragging = false;
diff --git a/src/ncurses_ui.cc b/src/ncurses_ui.cc
index f5896222..16db4a6a 100644
--- a/src/ncurses_ui.cc
+++ b/src/ncurses_ui.cc
@@ -1318,8 +1318,7 @@ void NCursesUI::enable_mouse(bool enabled)
         fputs("\033[?1002l", stdout);
         fputs("\033[?1000l", stdout);
         fputs("\033[?1004l", stdout);
-        if (m_builtin_key_parser)
-            fputs("\033[?1006l", stdout);
+        fputs("\033[?1006l", stdout);
     }
     fflush(stdout);
 }