diff --git a/xed/resources/ui/xed-searchbar.ui b/xed/resources/ui/xed-searchbar.ui
index 0ecddef..f8123f1 100755
--- a/xed/resources/ui/xed-searchbar.ui
+++ b/xed/resources/ui/xed-searchbar.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.0 -->
 <!--*- mode: xml -*-->
 <interface>
   <requires lib="gtk+" version="3.12"/>
@@ -58,6 +58,7 @@
                     <property name="vexpand">False</property>
                     <property name="label" translatable="yes">_Search for: </property>
                     <property name="use_underline">True</property>
+                    <property name="ellipsize">end</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -71,6 +72,7 @@
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Replace _with: </property>
                     <property name="use_underline">True</property>
+                    <property name="ellipsize">end</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -252,5 +254,8 @@
         </child>
       </object>
     </child>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/xed/xed-history-entry.c b/xed/xed-history-entry.c
index 7497faa..aad20ab 100644
--- a/xed/xed-history-entry.c
+++ b/xed/xed-history-entry.c
@@ -473,6 +473,7 @@ xed_history_entry_new (const gchar *history_id,
              gboolean     enable_completion)
 {
     GtkWidget *ret;
+    GtkEntry *real_entry;
 
     g_return_val_if_fail (history_id != NULL, NULL);
 
@@ -498,6 +499,9 @@ xed_history_entry_new (const gchar *history_id,
 
     xed_history_entry_set_enable_completion (XED_HISTORY_ENTRY (ret), enable_completion);
 
+    real_entry = GTK_ENTRY (xed_history_entry_get_entry (XED_HISTORY_ENTRY (ret)));
+    gtk_entry_set_width_chars (real_entry, 6);
+
     return ret;
 }