diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c
index 9599bbe..7a1e49f 100644
--- a/gtk/gtkplacesview.c
+++ b/gtk/gtkplacesview.c
@@ -1180,8 +1180,7 @@ update_places (GtkPlacesView *view)
   populate_servers (view);
 
   /* fetch networks and add them asynchronously */
-  if (!gtk_places_view_get_local_only (view))
-    fetch_networks (view);
+  fetch_networks (view);
 
   update_view_mode (view);
   /* Check whether we still are in a loading state */
@@ -1896,12 +1895,38 @@ on_listbox_row_activated (GtkPlacesView    *view,
 }
 
 static gboolean
+is_mount_locally_accessible (GMount *mount)
+{
+  GFile *base_file;
+
+  if (mount == NULL)
+    return FALSE;
+
+  base_file = g_mount_get_root (mount);
+
+  if (base_file != NULL)
+    {
+      char *path = g_file_get_path (base_file);
+      g_object_unref (base_file);
+
+      if (path != NULL)
+        {
+          g_free(path);
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
 listbox_filter_func (GtkListBoxRow *row,
                      gpointer       user_data)
 {
   GtkPlacesViewPrivate *priv;
   gboolean is_network;
   gboolean is_placeholder;
+  gboolean is_local = FALSE;
   gboolean retval;
   gboolean searching;
   gchar *name;
@@ -1914,7 +1939,22 @@ listbox_filter_func (GtkListBoxRow *row,
   is_network = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (row), "is-network"));
   is_placeholder = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (row), "is-placeholder"));
 
-  if (is_network && priv->local_only)
+  if (GTK_IS_PLACES_VIEW_ROW (row))
+    {
+      GtkPlacesViewRow *placesviewrow;
+      GMount *mount;
+
+      placesviewrow = GTK_PLACES_VIEW_ROW (row);
+      g_object_get(G_OBJECT (placesviewrow), "mount", &mount, NULL);
+
+      if (mount != NULL)
+        {
+          is_local = is_mount_locally_accessible (mount);
+          g_object_unref(mount);
+        }
+    }
+
+  if (is_network && priv->local_only && !is_local)
     return FALSE;
 
   if (is_placeholder && searching)
