diff --git a/src/activities/util/KeyboardEntryActivity.cpp b/src/activities/util/KeyboardEntryActivity.cpp
index f33a7a21..2704ef3c 100644
--- a/src/activities/util/KeyboardEntryActivity.cpp
+++ b/src/activities/util/KeyboardEntryActivity.cpp
@@ -226,13 +226,12 @@ void KeyboardEntryActivity::loop() {
   }
 
   // Selection
-  if (mappedInput.isPressed(MappedInputManager::Button::Confirm) && mappedInput.getHeldTime() >= capsMs) {
-    onCapsHeld();
-    return;
-  }
-
-  if (mappedInput.wasPressed(MappedInputManager::Button::Confirm) && mappedInput.getHeldTime() < capsMs) {
-    handleKeyPress();
+  if (mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
+    if (mappedInput.getHeldTime() >= capsMs) {
+      shiftActive = !shiftActive;
+    } else {
+      handleKeyPress();
+    }
     updateRequired = true;
   }
 
@@ -358,13 +357,3 @@ void KeyboardEntryActivity::renderItemWithSelector(const int x, const int y, con
   }
   renderer.drawText(UI_10_FONT_ID, x, y, item);
 }
-
-void KeyboardEntryActivity::onCapsHeld() {
-  waitForCapsRelease();
-  shiftActive = !shiftActive;
-  updateRequired = true;
-}
-
-void KeyboardEntryActivity::waitForCapsRelease() {
-  while (mappedInput.isPressed(MappedInputManager::Button::Confirm)) delay(50);
-}
diff --git a/src/activities/util/KeyboardEntryActivity.h b/src/activities/util/KeyboardEntryActivity.h
index f5d9f3d3..1c1b1f3e 100644
--- a/src/activities/util/KeyboardEntryActivity.h
+++ b/src/activities/util/KeyboardEntryActivity.h
@@ -96,7 +96,4 @@ class KeyboardEntryActivity : public Activity {
   int getRowLength(int row) const;
   void render() const;
   void renderItemWithSelector(int x, int y, const char* item, bool isSelected) const;
-
-  void onCapsHeld();
-  void waitForCapsRelease();
 };