diff --git a/fractal-gtk/res/ui/main_window.ui b/fractal-gtk/res/ui/main_window.ui
index b3249712..7954e921 100644
--- a/fractal-gtk/res/ui/main_window.ui
+++ b/fractal-gtk/res/ui/main_window.ui
@@ -342,11 +342,26 @@
                                       <class name="message-input"/>
                                     </style>
                                     <child>
-                                      <object class="GtkSourceView" id="msg_entry">
+                                      <object class="GtkScrolledWindow" id="input_scroll">
+                                        <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="wrap_mode">word-char</property>
-                                        <property name="indent_on_tab">False</property>
-                                        <property name="buffer">msg_entry_buffer</property>
+                                        <property name="hscrollbar_policy">never</property>
+                                        <property name="vscrollbar_policy">external</property>
+                                        <property name="max_content_height">100</property>
+                                        <property name="propagate_natural_height">True</property>
+                                        <child>
+                                          <object class="GtkSourceView" id="msg_entry">
+                                            <property name="can_focus">True</property>
+                                            <property name="wrap_mode">word-char</property>
+                                            <property name="indent_on_tab">False</property>
+                                            <property name="buffer">msg_entry_buffer</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
                                       </object>
                                       <packing>
                                         <property name="expand">True</property>