diff --git a/Userland/Applications/Calculator/CalculatorWidget.cpp b/Userland/Applications/Calculator/CalculatorWidget.cpp
index b1bc8e3c51..8b262e62c8 100644
--- a/Userland/Applications/Calculator/CalculatorWidget.cpp
+++ b/Userland/Applications/Calculator/CalculatorWidget.cpp
@@ -160,10 +160,6 @@ void CalculatorWidget::update_display()
 
 void CalculatorWidget::keydown_event(GUI::KeyEvent& event)
 {
-    //Clear button selection when we are typing
-    m_equals_button->set_focus(true);
-    m_equals_button->set_focus(false);
-
     if (event.key() == KeyCode::Key_Return || event.key() == KeyCode::Key_Equal) {
         m_keypad.set_value(m_calculator.finish_operation(m_keypad.value()));
         mimic_pressed_button(m_equals_button);
diff --git a/Userland/Applications/Calculator/CalculatorWindow.gml b/Userland/Applications/Calculator/CalculatorWindow.gml
index 40972e6274..fed5dea3d3 100644
--- a/Userland/Applications/Calculator/CalculatorWindow.gml
+++ b/Userland/Applications/Calculator/CalculatorWindow.gml
@@ -40,6 +40,7 @@
                     fixed_width: 65
                     fixed_height: 28
                     foreground_color: "brown"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {
@@ -48,6 +49,7 @@
                     fixed_width: 56
                     fixed_height: 28
                     foreground_color: "brown"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {
@@ -56,6 +58,7 @@
                     fixed_width: 60
                     fixed_height: 28
                     foreground_color: "brown"
+                    focus_policy: "NoFocus"
                 }
             }
 
@@ -68,6 +71,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "red"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Widget {
@@ -80,6 +84,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "blue"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {
@@ -88,6 +93,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "blue"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {
@@ -96,6 +102,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "blue"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {
@@ -103,6 +110,7 @@
                     text: "/"
                     fixed_width: 35
                     fixed_height: 28
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {
@@ -111,6 +119,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "blue"
+                    focus_policy: "NoFocus"
                 }
             }
 
@@ -123,6 +132,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "red"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Widget {
@@ -135,6 +145,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "blue"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {
@@ -143,6 +154,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "blue"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {
@@ -151,6 +163,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "blue"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {
@@ -158,6 +171,7 @@
                     text: "*"
                     fixed_width: 35
                     fixed_height: 28
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {
@@ -166,6 +180,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "blue"
+                    focus_policy: "NoFocus"
                 }
             }
 
@@ -178,6 +193,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "red"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Widget {
@@ -190,6 +206,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "blue"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {
@@ -198,6 +215,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "blue"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {
@@ -206,6 +224,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "blue"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {
@@ -213,6 +232,7 @@
                     text: "-"
                     fixed_width: 35
                     fixed_height: 28
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {
@@ -221,6 +241,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "blue"
+                    focus_policy: "NoFocus"
                 }
             }
 
@@ -233,6 +254,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "red"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Widget {
@@ -245,6 +267,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "blue"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {
@@ -253,6 +276,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "blue"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {
@@ -261,6 +285,7 @@
                     fixed_width: 35
                     fixed_height: 28
                     foreground_color: "blue"
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {
@@ -268,6 +293,7 @@
                     text: "+"
                     fixed_width: 35
                     fixed_height: 28
+                    focus_policy: "NoFocus"
                 }
 
                 @GUI::Button {