diff --git a/debian/kali-themes.postinst b/debian/kali-themes.postinst
index 44716f36..16e29c86 100644
--- a/debian/kali-themes.postinst
+++ b/debian/kali-themes.postinst
@@ -107,15 +107,15 @@ if [ "$1" = "configure" ]; then
 	# Install remaining new files
 	install_all
     fi
-    # Disable some backgrounds in Gnome and KDE
-    while read file; do
-        mkdir -p "$(dirname $file)/disabled"
-        dpkg-divert --rename --package kali-themes \
-                             --divert "$(dirname $file)/disabled/$(basename $file)" \
-                             --add "$file"
-    done << EOF
-/usr/share/gnome-background-properties/gnome-backgrounds.xml
-EOF
+    # Disable GNOME backgrounds
+    file=/usr/share/gnome-background-properties/gnome-backgrounds.xml
+    if [ -e $file ]; then
+	diverted_file=$(dirname $file)/disabled/$(basename $file)
+	mkdir -p "$(dirname $diverted_file)"
+	dpkg-divert --rename --package kali-themes \
+		    --divert "$diverted_file" \
+		    --add "$file"
+    fi
     # Configure /root/.face to have a red-background avatar
     if [ ! -e /root/.face ]; then
         cp /usr/share/kali-themes/.face-root.svg /root/.face
diff --git a/debian/kali-themes.postrm b/debian/kali-themes.postrm
index 4799dcbb..2043848f 100644
--- a/debian/kali-themes.postrm
+++ b/debian/kali-themes.postrm
@@ -41,18 +41,15 @@ case "$1" in
 	            --divert "$file.original" \
 		    --remove "$file"
 	done
-    # Recover disabled backgrounds
-    for dir in /usr/share/gnome-background-properties; do
-        dpkg-divert --list "$dir/disabled/*" \
-            | grep 'kali-themes$' \
-            | cut -d ' ' -f 3,5 \
-            | while read file diverted_file; do
-                dpkg-divert --rename --package kali-themes \
-                            --divert "$diverted_file" \
-                            --remove "$file"
-            done
-        rmdir "$dir/disabled"
-    done
+	# Recover GNOME backgrounds
+	file=/usr/share/gnome-background-properties/gnome-backgrounds.xml
+	diverted_file=$(dirname $file)/disabled/$(basename $file)
+	if [ -e "$diverted_file" ]; then
+	    dpkg-divert --rename --package kali-themes \
+			--divert "$diverted_file" \
+			--remove "$file"
+	    rmdir "$(dirname $diverted_file)" || :
+	fi
     ;;
 esac