diff --git a/setup-wizard/nanodroid-setup b/setup-wizard/nanodroid-setup
index e2878cd..67a39ed 100644
--- a/setup-wizard/nanodroid-setup
+++ b/setup-wizard/nanodroid-setup
@@ -58,6 +58,11 @@ ui_print "         Setup Wizard         "
 ui_print "******************************"
 ui_print " "
 
+if (is_mounted /data); then
+	mount -orw,remount /data >/dev/null
+else	mount -orw /data >/dev/null
+fi
+
 if grep -q "selected.1=1" "${location_prop}"; then
 	ui_print " > saving configuration in: /data/media/0"
 	configpath="/data/media/0"
@@ -72,10 +77,6 @@ elif grep -q "selected.1=2" "${location_prop}"; then
 elif grep -q "selected.1=3" "${location_prop}"; then
 	ui_print " > saving configuration in: /data"
 	configpath="/data"
-	if (is_mounted /data); then
-		mount -orw,remount /data >/dev/null
-	else	mount -orw /data >/dev/null
-	fi
 fi
 
 nanodroid_apps="${configpath}/.nanodroid-apps"