diff --git a/src/cheogram/res/layout/command_page.xml b/src/cheogram/res/layout/command_page.xml
index c624dd8f8b016b26143952cbfa78a06465254dd9..c5a981e06e14f67d8c725b40eca7ea79bd861c40 100644
--- a/src/cheogram/res/layout/command_page.xml
+++ b/src/cheogram/res/layout/command_page.xml
@@ -9,6 +9,7 @@
             android:id="@+id/form"
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
+            android:layout_above="@+id/done"
             android:orientation="vertical"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 1ee34adb438ce01008317ce6801047ce7875301d..8e987e9bc29c4a507d10c517151db0fea75b9b8d 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -1406,6 +1406,10 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
 
             public void setBinding(CommandPageBinding b) {
                 mBinding = b;
+                mBinding.form.setLayoutManager(new LinearLayoutManager(mPager.getContext()) {
+                    @Override
+                    public boolean canScrollVertically() { return getItemCount() > 1; }
+                });
             }
         }
     }