diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/LatinIME.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/LatinIME.java
index 6a874bb0b..a1b7c5860 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/LatinIME.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/LatinIME.java
@@ -1184,6 +1184,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
 
     @Override
     public void hideWindow() {
+        mSuggestionStripView.setToolbarVisibility(false);
         mKeyboardSwitcher.onHideWindow();
 
         if (TRACE) Debug.stopMethodTracing();
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/suggestions/SuggestionStripView.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/suggestions/SuggestionStripView.java
index 8c34a0e1c..9aa441353 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/suggestions/SuggestionStripView.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/suggestions/SuggestionStripView.java
@@ -641,16 +641,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
             }
         }
         if (view == mToolbarKey) {
-            if (mToolbarContainer.getVisibility() == VISIBLE) {
-                mToolbarContainer.setVisibility(GONE);
-                mSuggestionsStrip.setVisibility(VISIBLE);
-                mPinnedKeys.setVisibility(VISIBLE);
-            } else {
-                mToolbarContainer.setVisibility(VISIBLE);
-                mSuggestionsStrip.setVisibility(GONE);
-                mPinnedKeys.setVisibility(GONE);
-            }
-            mToolbarKey.setScaleX(mToolbarContainer.getVisibility() != VISIBLE ? 1f : -1f);
+            setToolbarVisibility(mToolbarContainer.getVisibility() != VISIBLE);
         }
 
 
@@ -679,6 +670,19 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
         // This may be overriden by showing suggestions later, if applicable.
     }
 
+    public void setToolbarVisibility(final boolean visible) {
+        if (visible) {
+            mPinnedKeys.setVisibility(GONE);
+            mSuggestionsStrip.setVisibility(GONE);
+            mToolbarContainer.setVisibility(VISIBLE);
+        } else {
+            mToolbarContainer.setVisibility(GONE);
+            mSuggestionsStrip.setVisibility(VISIBLE);
+            mPinnedKeys.setVisibility(VISIBLE);
+        }
+        mToolbarKey.setScaleX(visible ? -1f : 1f);
+    }
+
     private void addKeyToPinnedKeys(final String pinnedKey, final LayoutInflater inflater) {
         final int resId = getKeyLayoutIdForTag(pinnedKey);
         if (resId == 0) return;