diff -Nru unity-gtk-module-0.0.0+17.10.20170816/debian/changelog unity-gtk-module-0.0.0+17.10.20170817/debian/changelog
--- unity-gtk-module-0.0.0+17.10.20170816/debian/changelog	2017-08-17 11:48:16.000000000 +0000
+++ unity-gtk-module-0.0.0+17.10.20170817/debian/changelog	2017-08-17 11:48:16.000000000 +0000
@@ -1,3 +1,11 @@
+unity-gtk-module (0.0.0+17.10.20170817-0ubuntu1) artful; urgency=medium
+
+  * Properly limit the workaround to DnD windows only to complete the
+    intended implementation for LP: #1710999. Thanks to Konstantin
+    Putin. (LP: #1658996)
+
+ -- Martin Wimpress <martin.wimpress@canonical.com>  Thu, 17 Aug 2017 11:46:19 +0000
+
 unity-gtk-module (0.0.0+17.10.20170816-0ubuntu1) artful; urgency=medium
 
   * Remove DnD windows from the hijack and always use RGBA visual in
diff -Nru unity-gtk-module-0.0.0+17.10.20170816/src/main.c unity-gtk-module-0.0.0+17.10.20170817/src/main.c
--- unity-gtk-module-0.0.0+17.10.20170816/src/main.c	2017-08-16 08:38:21.000000000 +0000
+++ unity-gtk-module-0.0.0+17.10.20170817/src/main.c	2017-08-17 11:45:44.000000000 +0000
@@ -553,7 +553,7 @@
 
   GdkScreen *screen = gtk_widget_get_screen(widget);
   GdkVisual *visual = gdk_screen_get_rgba_visual(screen);
-  if (visual)
+  if (visual && (gtk_window_get_type_hint (GTK_WINDOW (widget)) == GDK_WINDOW_TYPE_HINT_DND))
     gtk_widget_set_visual(widget, visual);
 
   if (pre_hijacked_window_realize != NULL)