diff --git a/app/src/main/java/helium314/keyboard/latin/LatinIME.java b/app/src/main/java/helium314/keyboard/latin/LatinIME.java
index 1e82386c2f..7135887393 100644
--- a/app/src/main/java/helium314/keyboard/latin/LatinIME.java
+++ b/app/src/main/java/helium314/keyboard/latin/LatinIME.java
@@ -1119,8 +1119,9 @@ public void onExtractedCursorMovement(final int dx, final int dy) {
     @Override
     public void hideWindow() {
         Log.i(TAG, "hideWindow");
-        if (hasSuggestionStripView() && mSettings.getCurrent().mToolbarMode == ToolbarMode.EXPANDABLE)
-            mSuggestionStripView.setToolbarVisibility(false);
+        // keep the toolbar expand/collapse state across closing and reopening the keyboard; the
+        // "auto show"/"auto hide toolbar" settings still control it while typing, but closing the
+        // window no longer forces it back to the suggestion strip
         mKeyboardSwitcher.onHideWindow();
 
         if (TRACE) Debug.stopMethodTracing();