diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index b7227a0..3c72ec6 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -1770,24 +1770,24 @@ model_add_volumes (GtkFileChooserButton *button,
 
       volume = l->data;
 
+      if (_gtk_file_system_volume_is_mounted (volume))
+	continue;
+
       if (local_only)
 	{
-	  if (_gtk_file_system_volume_is_mounted (volume))
-	    {
-	      GFile *base_file;
+	  GFile *base_file;
 
-	      base_file = _gtk_file_system_volume_get_root (volume);
-	      if (base_file != NULL)
+	  base_file = _gtk_file_system_volume_get_root (volume);
+	  if (base_file != NULL)
+            {
+              if (!g_file_is_native (base_file))
                 {
-                  if (!g_file_is_native (base_file))
-                    {
-                      g_object_unref (base_file);
-                      continue;
-                    }
-                  else
                     g_object_unref (base_file);
+                    continue;
                 }
-	    }
+              else
+                g_object_unref (base_file);
+            }
 	}
 
       pixbuf = _gtk_file_system_volume_render_icon (volume,
