diff --git a/exwm-manage.el b/exwm-manage.el
index f29186f..659f1af 100644
--- a/exwm-manage.el
+++ b/exwm-manage.el
@@ -410,9 +410,9 @@ This only works when procfs is mounted, which may not be the case on some BSDs."
       (if (plist-get exwm--configurations 'char-mode)
           (exwm-input-release-keyboard id)
         (exwm-input-grab-keyboard id))
-      (when-let ((simulation-keys (plist-get exwm--configurations 'simulation-keys)))
+      (when-let* ((simulation-keys (plist-get exwm--configurations 'simulation-keys)))
         (exwm-input-set-local-simulation-keys simulation-keys))
-      (when-let ((prefix-keys (plist-get exwm--configurations 'prefix-keys)))
+      (when-let* ((prefix-keys (plist-get exwm--configurations 'prefix-keys)))
         (setq-local exwm-input-prefix-keys prefix-keys))
       (setq exwm-workspace--switch-history-outdated t)
       (exwm--update-desktop id)
diff --git a/exwm-workspace.el b/exwm-workspace.el
index 3e1b9ee..7f5bea6 100644
--- a/exwm-workspace.el
+++ b/exwm-workspace.el
@@ -342,7 +342,7 @@ Show PROMPT to the user if non-nil."
          ;; Get workareas prior to struts.
          (workareas (mapcar
                      (lambda (frame)
-                       (if-let (rect (frame-parameter frame 'exwm-geometry))
+                       (if-let* ((rect (frame-parameter frame 'exwm-geometry)))
                            ;; Use the 'exwm-geometry' frame parameter if it
                            ;; exists.  Make sure to clone it, will be modified
                            ;; below!