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 3d94f13b7..3dc88e7f1 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
@@ -65,6 +65,7 @@ import org.dslul.openboard.inputmethod.latin.utils.ToolbarUtilsKt;
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.core.view.ViewCompat;
 
@@ -254,6 +255,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
                 : km.isKeyguardLocked();
         mToolbarExpandKey.setOnClickListener(hideToolbarKeys ? null : this);
         mPinnedKeys.setVisibility(hideToolbarKeys ? GONE : VISIBLE);
+        mToolbarExpandKey.setVisibility(VISIBLE);
     }
 
     public void setRtl(final boolean isRtlLanguage) {
@@ -276,6 +278,13 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
         mSuggestionsStrip.addView(view);
     }
 
+    @Override
+    public void onVisibilityChanged(@NonNull final View view, final int visibility) {
+        super.onVisibilityChanged(view, visibility);
+        if (view == this)
+            mSuggestionsStrip.setVisibility(visibility);
+    }
+
     public void setMoreSuggestionsHeight(final int remainingHeight) {
         mLayoutHelper.setMoreSuggestionsHeight(remainingHeight);
     }