diff --git a/DevTools/HackStudio/CursorTool.cpp b/DevTools/HackStudio/CursorTool.cpp
index 63ee928399..920862037f 100644
--- a/DevTools/HackStudio/CursorTool.cpp
+++ b/DevTools/HackStudio/CursorTool.cpp
@@ -147,6 +147,8 @@ void CursorTool::on_keydown(GUI::KeyEvent& event)
         case Key_Right:
             move_selected_widgets_by(m_editor.form_widget().grid_size(), 0);
             break;
+        default:
+            break;
         }
     }
 }
diff --git a/DevTools/VisualBuilder/VBForm.cpp b/DevTools/VisualBuilder/VBForm.cpp
index c9aa3c3d6e..9963708153 100644
--- a/DevTools/VisualBuilder/VBForm.cpp
+++ b/DevTools/VisualBuilder/VBForm.cpp
@@ -217,6 +217,8 @@ void VBForm::keydown_event(GUI::KeyEvent& event)
                 widget.gwidget()->move_by(m_grid_size, 0);
             });
             break;
+        default:
+            break;
         }
         return;
     }
diff --git a/Libraries/LibGUI/Event.h b/Libraries/LibGUI/Event.h
index c2059558a3..1dd6dec569 100644
--- a/Libraries/LibGUI/Event.h
+++ b/Libraries/LibGUI/Event.h
@@ -264,14 +264,14 @@ enum MouseButton : u8 {
 
 class KeyEvent final : public Event {
 public:
-    KeyEvent(Type type, int key, u8 modifiers)
+    KeyEvent(Type type, KeyCode key, u8 modifiers)
         : Event(type)
         , m_key(key)
         , m_modifiers(modifiers)
     {
     }
 
-    int key() const { return m_key; }
+    KeyCode key() const { return m_key; }
     bool ctrl() const { return m_modifiers & Mod_Ctrl; }
     bool alt() const { return m_modifiers & Mod_Alt; }
     bool shift() const { return m_modifiers & Mod_Shift; }
@@ -283,7 +283,7 @@ public:
 
 private:
     friend class WindowServerConnection;
-    int m_key { 0 };
+    KeyCode m_key { 0 };
     u8 m_modifiers { 0 };
     String m_text;
 };
diff --git a/Libraries/LibGUI/WindowServerConnection.cpp b/Libraries/LibGUI/WindowServerConnection.cpp
index 28dac7251a..38ef7f0f8b 100644
--- a/Libraries/LibGUI/WindowServerConnection.cpp
+++ b/Libraries/LibGUI/WindowServerConnection.cpp
@@ -129,7 +129,7 @@ void WindowServerConnection::handle(const Messages::WindowClient::KeyDown& messa
     if (!window)
         return;
 
-    auto key_event = make<KeyEvent>(Event::KeyDown, message.key(), message.modifiers());
+    auto key_event = make<KeyEvent>(Event::KeyDown, (KeyCode) message.key(), message.modifiers());
     if (message.character() != '\0') {
         char ch = message.character();
         key_event->m_text = String(&ch, 1);
@@ -188,7 +188,7 @@ void WindowServerConnection::handle(const Messages::WindowClient::KeyUp& message
     if (!window)
         return;
 
-    auto key_event = make<KeyEvent>(Event::KeyUp, message.key(), message.modifiers());
+    auto key_event = make<KeyEvent>(Event::KeyUp, (KeyCode) message.key(), message.modifiers());
     if (message.character() != '\0') {
         char ch = message.character();
         key_event->m_text = String(&ch, 1);
diff --git a/Libraries/LibWeb/HtmlView.cpp b/Libraries/LibWeb/HtmlView.cpp
index 3b5e48bb54..e1e768ba24 100644
--- a/Libraries/LibWeb/HtmlView.cpp
+++ b/Libraries/LibWeb/HtmlView.cpp
@@ -316,6 +316,8 @@ void HtmlView::keydown_event(GUI::KeyEvent& event)
         case Key_PageUp:
             vertical_scrollbar().set_value(vertical_scrollbar().value() - frame_inner_rect().height());
             break;
+        default:
+            break;
         }
     }