diff --git a/fractal-gtk/res/app.css b/fractal-gtk/res/app.css
index d1b2c3b0881cc6fad4073f7caebe6626237b8bf3..ac9e89d613d1bfed6774c4311401c0e96dd6ce67 100644
--- a/fractal-gtk/res/app.css
+++ b/fractal-gtk/res/app.css
@@ -214,6 +214,10 @@ row .timestamp {
   margin-left: 150px;
 }
 
+.autocomplete.narrow {
+  margin-left: 0;
+}
+
 .autocomplete,
 .autocomplete list,
 .autocomplete row:not(:hover):not(:selected) {
diff --git a/fractal-gtk/src/app/mod.rs b/fractal-gtk/src/app/mod.rs
index 365435fb415446e302e0913ff28c9756b41b08b9..928474146cf0b922d0bcf7d5254b215c4269ef25 100644
--- a/fractal-gtk/src/app/mod.rs
+++ b/fractal-gtk/src/app/mod.rs
@@ -135,9 +135,14 @@ impl App {
             .builder
             .get_object::<gtk::Box>("history_container")
             .expect("Can't find history_container in ui file.");
+        let popover = ui
+            .builder
+            .get_object::<gtk::Popover>("autocomplete_popover")
+            .expect("Can't find autocomplete_popover in ui file.");
 
         if let libhandy::Fold::Folded = leaflet.get_fold() {
             container.get_style_context().add_class("folded-history");
+            popover.get_style_context().add_class("narrow");
         }
 
         let weak_container = container.downgrade();
@@ -145,9 +150,13 @@ impl App {
             let container = upgrade_weak!(weak_container);
 
             match leaflet.get_fold() {
-                libhandy::Fold::Folded => container.get_style_context().add_class("folded-history"),
+                libhandy::Fold::Folded => {
+                    container.get_style_context().add_class("folded-history");
+                    popover.get_style_context().add_class("narrow");
+                }
                 libhandy::Fold::Unfolded => {
                     container.get_style_context().remove_class("folded-history");
+                    popover.get_style_context().remove_class("narrow");
                 }
                 _ => (),
             }