diff -Nru gnome-disk-utility-3.18.3.1/debian/changelog gnome-disk-utility-3.18.3.1/debian/changelog
--- gnome-disk-utility-3.18.3.1/debian/changelog	2015-12-01 16:35:08.000000000 +0000
+++ gnome-disk-utility-3.18.3.1/debian/changelog	2018-02-07 14:53:25.000000000 +0000
@@ -1,3 +1,11 @@
+gnome-disk-utility (3.18.3.1-1ubuntu1.1) xenial; urgency=medium
+
+  * debian/patches/hide-snaps.patch:
+    - Don't list snaps loop mount as disks/devices since that's confusing 
+      (lp: #1637984)
+
+ -- Andrea Azzarone <andrea.azzarone@canonical.com>  Wed, 07 Feb 2018 16:01:32 +0100
+
 gnome-disk-utility (3.18.3.1-1ubuntu1) xenial; urgency=medium
 
   * Resynchronize on Debian, remaining changes
diff -Nru gnome-disk-utility-3.18.3.1/debian/patches/hide-snaps.patch gnome-disk-utility-3.18.3.1/debian/patches/hide-snaps.patch
--- gnome-disk-utility-3.18.3.1/debian/patches/hide-snaps.patch	1970-01-01 00:00:00.000000000 +0000
+++ gnome-disk-utility-3.18.3.1/debian/patches/hide-snaps.patch	2018-02-07 14:48:36.000000000 +0000
@@ -0,0 +1,31 @@
+Author: Andrea Azzarone <andrea.azzarone@canonical.com>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=790279
+Bug-Ubuntu: https://launchpad.net/bugs/1637984
+Forwarded: not-needed
+Last-Update: 2018-02-06
+Description: Hide snap loop devices
+ Workaround to hide snaps. This is needed because the upstream fix requires
+ libmount >= 2.30 while xenial ships with an older version of libmount1.
+
+--- gnome-disk-utility-3.18.3.1.orig/src/disks/gdudevicetreemodel.c
++++ gnome-disk-utility-3.18.3.1/src/disks/gdudevicetreemodel.c
+@@ -1188,6 +1188,7 @@
+   const gchar *device;
+   const gchar *drive;
+   const gchar *crypto_backing_device;
++  const gchar *loop_backing_file;
+   guint64 size;
+ 
+   ret = FALSE;
+@@ -1196,6 +1197,11 @@
+   partition = udisks_object_peek_partition (object);
+   loop = udisks_object_peek_loop (object);
+ 
++  // Hide snaps loop devices
++  loop_backing_file = loop != NULL ? udisks_loop_get_backing_file (loop) : NULL;
++  if (loop_backing_file != NULL && g_str_has_suffix (loop_backing_file, ".snap"))
++    goto out;
++
+   /* RAM devices are useless */
+   device = udisks_block_get_device (block);
+   if (g_str_has_prefix (device, "/dev/ram"))
diff -Nru gnome-disk-utility-3.18.3.1/debian/patches/series gnome-disk-utility-3.18.3.1/debian/patches/series
--- gnome-disk-utility-3.18.3.1/debian/patches/series	2015-12-01 16:33:10.000000000 +0000
+++ gnome-disk-utility-3.18.3.1/debian/patches/series	2018-02-07 14:48:36.000000000 +0000
@@ -1,3 +1,3 @@
 # Debian patches for gnome-disk-utility
 dont-use-libdvdread.patch
-
+hide-snaps.patch