diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 81150d0..b17ff97 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -8666,10 +8666,18 @@ gtk_file_chooser_default_should_respond (GtkFileChooserEmbed *chooser_embed)
     }
   else if (impl->location_entry && impl->toplevel_last_focus_widget == impl->location_entry)
     {
-      /* The focus is on a dialog's action area button, *and* the widget that
-       * was focused immediately before it is the location entry.
-       */
-      goto save_entry;
+      if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER &&
+          impl->operation_mode == OPERATION_MODE_BROWSE)
+        /* The user didn't select anything but this case should be allowed
+         * because we have a default selection, see BGO#402349
+         */
+        goto file_list;
+
+      else
+        /* The focus is on a dialog's action area button, *and* the widget that
+         * was focused immediately before it is the location entry.
+         */
+        goto save_entry;
     }
   else
     /* The focus is on a dialog's action area button or something else */
