diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/afterboot.sh b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/afterboot.sh
new file mode 100755
index 0000000..e48d68a
--- /dev/null
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/afterboot.sh
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+. ./common.inc
+
+exec ./handle-control-change.sh
diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/switch-to-dnscrypt-if-required.sh b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/switch-to-dnscrypt-if-required.sh
index ea1b5ad..64e245f 100755
--- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/switch-to-dnscrypt-if-required.sh
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/switch-to-dnscrypt-if-required.sh
@@ -8,7 +8,7 @@ PAUSE_INCREMENT=0.1
 [ ! -e "$DNSCRYPT_FILE" ] && exit 0
 
 pause=0
-while :; do
+while [ -e "$DNSCRYPT_FILE" ]; do
   if [ $pause -lt $PAUSE_MAX ]; then
     pause=$((pause + $PAUSE_INCREMENT))
   fi
@@ -29,4 +29,8 @@ while :; do
   break
 done
 
+if [ ! -e "$DNSCRYPT_FILE" ]; then
+  touch "$CONTROL_DIR"
+fi
+
 exec ./exceptions-add.sh