diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
index dede8d7f8..2100349b2 100644
--- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
@@ -623,7 +623,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
                 onDispose { com.droiddeck.launcher.glasses.GlassesMenuMirror.setSessionMenuVisible(this@SessionActivity, false) }
             }
             androidx.compose.runtime.LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, pipUi) { updatePointerCapture() }
-            androidx.compose.runtime.LaunchedEffect(pcKeyboardOpen, AgentGuest.steamKeyboard) { updateOnScreenControls() }
+            androidx.compose.runtime.LaunchedEffect(AgentGuest.steamKeyboard) { updateOnScreenControls() }
             androidx.compose.runtime.LaunchedEffect(picturePosition, SessionState.running, pipUi, cardboard.enabled) { applyGameAlignment() }
             DroidDeckTheme {
             if (pipUi) {
@@ -2723,7 +2723,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
     }
 
     private fun keyboardCoversPad() =
-        SessionState.mode == SessionService.MODE_STEAM && (pcKeyboardOpen || AgentGuest.steamKeyboard)
+        SessionState.mode == SessionService.MODE_STEAM && AgentGuest.steamKeyboard
 
     private fun sendGuestKey(code: Int, down: Boolean) {
         if (down && pipUi) return
diff --git a/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt
index 6c841c984..7ba52e168 100644
--- a/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt
+++ b/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt
@@ -62,13 +62,15 @@ class SessionKeyboardPadTest {
         assertEquals(View.VISIBLE, controls.visibility)
     }
 
-    @Test fun keyboardsLeaveThePadAloneOutsideSteam() {
+    @Test fun steamsKeyboardLeavesThePadAloneOutsideSteam() {
         SessionState.mode = SessionService.MODE_DESKTOP
         SessionPrefs.setOscMode(activity, SessionPrefs.OSC_ALWAYS)
         steamKeyboard(true)
-        pcKeyboard(true)
         update()
         assertEquals(View.VISIBLE, controls.visibility)
+        pcKeyboard(true)
+        update()
+        assertEquals(View.GONE, controls.visibility)
     }
 
     @Test fun steamTouchControllerHidesAndHandsTouchBackWhileSteamsKeyboardIsUp() {