diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index ef0eb1ca108..0055914105d 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -4598,9 +4598,10 @@ This is run upon minibuffer setup."
     (cancel-timer minibuffer-on-screen-keyboard-timer)
     (setq minibuffer-on-screen-keyboard-timer nil))
   (setq minibuffer-on-screen-keyboard-displayed nil)
-  (when (not (memq (device-class last-event-frame
-                               last-event-device)
-                   '(keyboard core-keyboard)))
+  (when (and (framep last-event-frame)
+             (not (memq (device-class last-event-frame
+                                      last-event-device)
+                        '(keyboard core-keyboard))))
     (setq minibuffer-on-screen-keyboard-displayed
           (frame-toggle-on-screen-keyboard (selected-frame) nil))))
 
diff --git a/src/keyboard.c b/src/keyboard.c
index e376fa299dd..11c37372db7 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4996,8 +4996,6 @@ const char *const lispy_function_keys[] =
     [19]  = "up",
     [20]  = "down",
     [213] = "muhenkan",
-    [213] = "muhenkan",
-    [214] = "henkan",
     [214] = "henkan",
     [215] = "hiragana-katakana",
     [218] = "kana",