diff --git a/src/tracker-preferences/tracker-preferences.ui b/src/tracker-preferences/tracker-preferences.ui
index 3f99d7a..f78e0f6 100644
--- a/src/tracker-preferences/tracker-preferences.ui
+++ b/src/tracker-preferences/tracker-preferences.ui
@@ -907,13 +907,14 @@
                                         <property name="orientation">vertical</property>
                                         <property name="spacing">6</property>
                                         <child>
-                                          <object class="GtkButton" id="button_ignored_directories_add">
+                                          <object class="GtkButton" id="button_ignored_directories_globs_add">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <signal name="clicked" handler="button_ignored_directories_add_clicked_cb"/>
+                                            <property name="tooltip_text" translatable="yes">Opens text entry for glob patterns</property>
+                                            <signal name="clicked" handler="button_ignored_directories_globs_add_clicked_cb"/>
                                             <child>
-                                              <object class="GtkImage" id="image6">
+                                              <object class="GtkImage" id="image">
                                                 <property name="visible">True</property>
                                                 <property name="stock">gtk-add</property>
                                               </object>
@@ -943,7 +944,24 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <placeholder/>
+                                          <object class="GtkButton" id="button_ignored_directories_add">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="tooltip_text" translatable="yes">Opens the filechooser dialogue</property>
+                                            <property name="yalign">0.49000000953674316</property>
+                                            <signal name="clicked" handler="button_ignored_directories_add_clicked_cb"/>
+                                            <child>
+                                              <object class="GtkImage" id="image6">
+                                                <property name="visible">True</property>
+                                                <property name="stock">gtk-directory</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="position">2</property>
+                                          </packing>
                                         </child>
                                       </object>
                                       <packing>
diff --git a/src/tracker-preferences/tracker-preferences.vala b/src/tracker-preferences/tracker-preferences.vala
index 7b44f8a..12d5ff3 100644
--- a/src/tracker-preferences/tracker-preferences.vala
+++ b/src/tracker-preferences/tracker-preferences.vala
@@ -126,12 +126,14 @@ public static void add_freevalue (ListStore model) {
 
 	dialog = new Dialog.with_buttons (_("Enter value"),
 	                                  window,
-	                                  DialogFlags.DESTROY_WITH_PARENT,
+	                                  DialogFlags.DESTROY_WITH_PARENT | DialogFlags.NO_SEPARATOR,
 	                                  STOCK_CANCEL, ResponseType.CANCEL,
 	                                  STOCK_OK, ResponseType.ACCEPT);
 
+	dialog.set_default_response(ResponseType.ACCEPT);
 	content_area = (Container) dialog.get_content_area ();
 	entry = new Entry ();
+	entry.set_activates_default (true);
 	entry.show ();
 	content_area.add (entry);
 
@@ -209,6 +211,10 @@ public static void button_index_single_add_clicked_cb (Button source) {
 }
 
 public static void button_ignored_directories_add_clicked_cb (Button source) {
+	add_dir (liststore_ignored_directories);
+}
+
+public static void button_ignored_directories_globs_add_clicked_cb (Button source) {
 	add_freevalue (liststore_ignored_directories);
 }
 
@@ -232,8 +238,7 @@ public static void button_ignored_files_remove_clicked_cb (Button source) {
 	del_dir (treeview_ignored_files);
 }
 
-public static SList<string> model_to_slist (ListStore model)
-{
+public static SList<string> model_to_slist (ListStore model) {
 	bool valid;
 	SList<string> list = new SList<string>();
 	TreeIter iter;
