diff --git a/exwm-layout.el b/exwm-layout.el
index c9146de37..09428da4b 100644
--- a/exwm-layout.el
+++ b/exwm-layout.el
@@ -455,7 +455,8 @@ See also `exwm-layout-enlarge-window'."
                            (window-mode-line-height (frame-root-window
                                                      exwm--floating-frame)))
                         nil t)
-      (exwm-input-grab-keyboard))))
+      (exwm-input-grab-keyboard))
+    (force-mode-line-update)))
 
 ;;;###autoload
 (defun exwm-layout-toggle-mode-line ()
diff --git a/exwm-workspace.el b/exwm-workspace.el
index 8230bd762..283b3849d 100644
--- a/exwm-workspace.el
+++ b/exwm-workspace.el
@@ -453,7 +453,7 @@ The optional FORCE option is for internal use only."
                               (setq result
                                     (+ result
                                        (ceiling (1+ (length i)) width))))
-                            (split-string (current-message) "\n"))
+                            (split-string (or (current-message) "") "\n"))
                       result)
                   (count-screen-lines))))))
     (when (and (integerp max-mini-window-height)