diff --git a/radio/src/storage/storage_common.cpp b/radio/src/storage/storage_common.cpp
index 501a6ce15..c467ce3d4 100644
--- a/radio/src/storage/storage_common.cpp
+++ b/radio/src/storage/storage_common.cpp
@@ -181,6 +181,10 @@ void postModelLoad(bool alarms)
   g_model.modelGVDisabled = false;
 #endif
 
+#if defined(FUNCTION_SWITCHES)
+  setFSStartupPosition();
+#endif
+
   // Convert 'noGlobalFunctions' to 'radioGFDisabled'
   // TODO: Remove sometime in the future (and remove 'noGlobalFunctions' property)
   if (g_model.noGlobalFunctions) {