diff --git a/gui/devices/landscape/res/landscape.xml b/gui/devices/landscape/res/landscape.xml
index aea32f1b..27f5bae7 100644
--- a/gui/devices/landscape/res/landscape.xml
+++ b/gui/devices/landscape/res/landscape.xml
@@ -1386,6 +1386,26 @@
 			<object type="template" name="footer" />
 		</page>
 
+		<page name="refreshfilesystem">
+			<object type="action">
+				<condition var1="tw_check_partition_list" op="=" var2="1" />
+				<actions>
+					<action function="set">partitionlisterror=0</action>
+					<action function="getpartitiondetails"></action>
+					<action function="page">selectfilesystem</action>
+				</actions>
+			</object>
+
+			<object type="action">
+				<condition var1="tw_check_partition_list" op="!=" var2="1" />
+				<actions>
+					<action function="set">partitionlisterror=1</action>
+					<action function="set">tw_wipe_list=</action>
+					<action function="page">advancedwipe</action>
+				</actions>
+			</object>
+		</page>
+
 		<page name="selectfilesystem">
 			<object type="template" name="header" />
 
@@ -1421,7 +1441,7 @@
 				<text>EXT2</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=ext2</action>
@@ -1443,7 +1463,7 @@
 				<text>EXT3</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=ext3</action>
@@ -1465,7 +1485,7 @@
 				<text>EXT4</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=ext4</action>
@@ -1487,7 +1507,7 @@
 				<text>F2FS</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=f2fs</action>
@@ -1509,7 +1529,7 @@
 				<text>FAT</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=vfat</action>
@@ -1531,7 +1551,7 @@
 				<text>exFAT</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=exfat</action>
diff --git a/gui/devices/portrait/res/portrait.xml b/gui/devices/portrait/res/portrait.xml
index e07a217b..06926b12 100644
--- a/gui/devices/portrait/res/portrait.xml
+++ b/gui/devices/portrait/res/portrait.xml
@@ -1108,6 +1108,26 @@
 			<object type="template" name="footer" />
 		</page>
 
+		<page name="refreshfilesystem">
+			<object type="action">
+				<condition var1="tw_check_partition_list" op="=" var2="1" />
+				<actions>
+					<action function="set">partitionlisterror=0</action>
+					<action function="getpartitiondetails"></action>
+					<action function="page">selectfilesystem</action>
+				</actions>
+			</object>
+
+			<object type="action">
+				<condition var1="tw_check_partition_list" op="!=" var2="1" />
+				<actions>
+					<action function="set">partitionlisterror=1</action>
+					<action function="set">tw_wipe_list=</action>
+					<action function="page">advancedwipe</action>
+				</actions>
+			</object>
+		</page>
+
 		<page name="selectfilesystem">
 			<object type="template" name="header" />
 
@@ -1149,7 +1169,7 @@
 				<text>EXT2</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=ext2</action>
@@ -1171,7 +1191,7 @@
 				<text>EXT3</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=ext3</action>
@@ -1193,7 +1213,7 @@
 				<text>EXT4</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=ext4</action>
@@ -1215,7 +1235,7 @@
 				<text>F2FS</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=f2fs</action>
@@ -1237,7 +1257,7 @@
 				<text>FAT</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=vfat</action>
@@ -1259,7 +1279,7 @@
 				<text>exFAT</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=exfat</action>
diff --git a/gui/devices/watch/res/watch.xml b/gui/devices/watch/res/watch.xml
index 00f449ea..5040b111 100644
--- a/gui/devices/watch/res/watch.xml
+++ b/gui/devices/watch/res/watch.xml
@@ -1047,6 +1047,26 @@
 			<object type="template" name="footer" />
 		</page>
 
+		<page name="refreshfilesystem">
+			<object type="action">
+				<condition var1="tw_check_partition_list" op="=" var2="1" />
+				<actions>
+					<action function="set">partitionlisterror=0</action>
+					<action function="getpartitiondetails"></action>
+					<action function="page">selectfilesystem</action>
+				</actions>
+			</object>
+
+			<object type="action">
+				<condition var1="tw_check_partition_list" op="!=" var2="1" />
+				<actions>
+					<action function="set">partitionlisterror=1</action>
+					<action function="set">tw_wipe_list=</action>
+					<action function="page">advancedwipe</action>
+				</actions>
+			</object>
+		</page>
+
 		<page name="selectfilesystem">
 			<object type="template" name="header" />
 
@@ -1082,7 +1102,7 @@
 				<text>EXT2</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=ext2</action>
@@ -1104,7 +1124,7 @@
 				<text>EXT3</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=ext3</action>
@@ -1126,7 +1146,7 @@
 				<text>EXT4</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=ext4</action>
@@ -1148,7 +1168,7 @@
 				<text>F2FS</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=f2fs</action>
@@ -1170,7 +1190,7 @@
 				<text>FAT</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=vfat</action>
@@ -1192,7 +1212,7 @@
 				<text>exFAT</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_back=selectfilesystem</action>
+					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
 					<action function="set">tw_action_param=%tw_partition_mount_point%</action>
 					<action function="set">tw_action_new_file_system=exfat</action>