diff --git a/gnome-flavour-selector.sh b/gnome-flavour-selector.sh
index 4dacdea..fa3c3f5 100755
--- a/gnome-flavour-selector.sh
+++ b/gnome-flavour-selector.sh
@@ -87,6 +87,11 @@ MODE=$(GDK_BACKEND=x11 yad		\
    "${table[@]}"
 )
 
+# Workarround for window kill
+if [ $? -ne 20 ]; then
+	MODE="Classic"
+fi
+
 if [ -z $MODE ]; then
 	exit 1
 fi