diff --git a/src/gui/Window.cc b/src/gui/Window.cc
index cc724ba..2474a92 100644
--- a/src/gui/Window.cc
+++ b/src/gui/Window.cc
@@ -286,10 +286,10 @@ void Window::handle_keyval(uint32_t keyval)
         case 'x':
             m_buffer_pane->kill_character_at_cursor();
             break;
-        case KEYMOD_CTRL + 'w':
+        case Keymod::CTRL + 'w':
             m_buffer_pane->write_file();
             break;
-        case KEYMOD_CTRL + 'q':
+        case Keymod::CTRL + 'q':
             m_exit_requested = true;
             break;
         }
@@ -326,20 +326,20 @@ uint32_t Window::get_keyval(SDL_Keycode keysym)
         }
         else
         {
-            keyval |= KEYMOD_SHIFT;
+            keyval |= Keymod::SHIFT;
         }
     }
     if ((m_keymod & KMOD_CTRL) != 0u)
     {
-        keyval |= KEYMOD_CTRL;
+        keyval |= Keymod::CTRL;
     }
     if ((m_keymod & KMOD_ALT) != 0u)
     {
-        keyval |= KEYMOD_ALT;
+        keyval |= Keymod::ALT;
     }
     if ((m_keymod & KMOD_GUI) != 0u)
     {
-        keyval |= KEYMOD_GUI;
+        keyval |= Keymod::GUI;
     }
     return keyval;
 }
diff --git a/src/gui/Window.h b/src/gui/Window.h
index 5835f53..d69c71a 100644
--- a/src/gui/Window.h
+++ b/src/gui/Window.h
@@ -13,12 +13,16 @@ class BufferPane;
 class Window
 {
 public:
-    enum : uint32_t
+    class Keymod
     {
-        KEYMOD_CTRL  = 0x10000,
-        KEYMOD_ALT   = 0x20000,
-        KEYMOD_SHIFT = 0x40000,
-        KEYMOD_GUI   = 0x80000,
+    public:
+        enum : uint32_t
+        {
+            CTRL  = 0x10000,
+            ALT   = 0x20000,
+            SHIFT = 0x40000,
+            GUI   = 0x80000,
+        };
     };
 
     enum class CursorMovement : uint8_t