diff --git a/src/activities/util/KeyboardEntryActivity.cpp b/src/activities/util/KeyboardEntryActivity.cpp
index a8207ddb..a88df27e 100644
--- a/src/activities/util/KeyboardEntryActivity.cpp
+++ b/src/activities/util/KeyboardEntryActivity.cpp
@@ -82,6 +82,8 @@ bool KeyboardEntryActivity::handleKeyPress() {
       case SpecOk:
         onComplete(text);
         return false;
+      default:
+        return true;
     }
   }
 
@@ -254,7 +256,7 @@ void KeyboardEntryActivity::render(RenderLock&&) {
   const int bkSpacing = metrics.keyboardBottomKeySpacing;
   const int contentTotalWidth = COLS * keyWidth + (COLS - 1) * keySpacing;
   const int bottomKeyWidth = (contentTotalWidth - (BOTTOM_KEY_COUNT - 1) * bkSpacing) / BOTTOM_KEY_COUNT;
-  const int bottomSelectedRow = isBottomRow(selectedRow);
+  const bool bottomSelected = isBottomRow(selectedRow);
 
   struct BottomKeyInfo {
     KeyboardKeyType themeType;
@@ -270,7 +272,7 @@ void KeyboardEntryActivity::render(RenderLock&&) {
 
   for (int i = 0; i < BOTTOM_KEY_COUNT; i++) {
     const int keyX = leftMargin + i * (bottomKeyWidth + bkSpacing);
-    const bool isSelected = bottomSelectedRow && i == selectedCol;
+    const bool isSelected = bottomSelected && i == selectedCol;
 
     GUI.drawKeyboardKey(renderer, Rect{keyX, bottomRowY, bottomKeyWidth, keyHeight}, bottomKeys[i].label, isSelected,
                         nullptr, bottomKeys[i].themeType);
diff --git a/src/components/themes/BaseTheme.cpp b/src/components/themes/BaseTheme.cpp
index 4428e5ee..17bc16ce 100644
--- a/src/components/themes/BaseTheme.cpp
+++ b/src/components/themes/BaseTheme.cpp
@@ -862,6 +862,7 @@ void BaseTheme::drawHelpText(const GfxRenderer& renderer, Rect rect, const char*
 }
 
 void BaseTheme::drawTextField(const GfxRenderer& renderer, Rect rect, const int textWidth) const {
+  (void)textWidth;
   const int lineHeight = renderer.getLineHeight(UI_12_FONT_ID);
   const int bracketHeight = lineHeight;
   const int fieldLeft = rect.x + 10;
@@ -914,10 +915,6 @@ void BaseTheme::drawKeyboardKey(const GfxRenderer& renderer, Rect rect, const ch
   const int itemWidth = renderer.getTextWidth(UI_12_FONT_ID, label);
   const int textX = rect.x + (rect.width - itemWidth) / 2;
   const int textY = rect.y + (rect.height - renderer.getLineHeight(UI_12_FONT_ID)) / 2 + primaryOffset;
-
-  if (isSelected) {
-    renderer.fillRect(rect.x, rect.y, rect.width, rect.height, true);
-  }
   renderer.drawText(UI_12_FONT_ID, textX, textY, label, !isSelected);
 
   if (hasSecondary) {