diff --git a/packages/project-editor/flow/runtime/cpp/eez-framework b/packages/project-editor/flow/runtime/cpp/eez-framework
index 3dee6f409..97c1492b4 160000
--- a/packages/project-editor/flow/runtime/cpp/eez-framework
+++ b/packages/project-editor/flow/runtime/cpp/eez-framework
@@ -1 +1 @@
-Subproject commit 3dee6f40927c74568901c8c97f3e16b4ecbb6051
+Subproject commit 97c1492b4811aa752f9c59cee74214933c6b721c
diff --git a/resources/eez-framework-amalgamation/eez-flow.cpp b/resources/eez-framework-amalgamation/eez-flow.cpp
index a7838c840..d0a99d7bc 100644
--- a/resources/eez-framework-amalgamation/eez-flow.cpp
+++ b/resources/eez-framework-amalgamation/eez-flow.cpp
@@ -1,4 +1,4 @@
-/* Autogenerated on November 16, 2024 4:57:49 PM from eez-framework commit 7a01ce78cb06c38d668e4873296b5652ec55b43f */
+/* Autogenerated on November 17, 2024 10:35:13 AM from eez-framework commit 3dee6f40927c74568901c8c97f3e16b4ecbb6051 */
 /*
  * eez-framework
  *
@@ -7332,7 +7332,7 @@ static lv_group_t *getLvglGroupFromIndex(int32_t index) {
 static int32_t getLvglScreenByName(const char *name) {
     for (size_t i = 0; i < g_numScreens; i++) {
         if (strcmp(g_screenNames[i], name) == 0) {
-            return i;
+            return i + 1;
         }
     }
     return -1;
@@ -7428,6 +7428,7 @@ extern "C" void eez_flow_init(const uint8_t *assets, uint32_t assetsSize, lv_obj
     eez::initAllocHeap(eez::ALLOC_BUFFER, eez::ALLOC_BUFFER_SIZE);
     eez::flow::replacePageHook = replacePageHook;
     eez::flow::getLvglObjectFromIndexHook = getLvglObjectFromIndex;
+    eez::flow::getLvglScreenByNameHook = getLvglScreenByName;
     eez::flow::getLvglObjectByNameHook = getLvglObjectByName;
     eez::flow::getLvglGroupByNameHook = getLvglGroupByName;
     eez::flow::getLvglStyleByNameHook = getLvglStyleByName;
diff --git a/resources/eez-framework-amalgamation/eez-flow.h b/resources/eez-framework-amalgamation/eez-flow.h
index c595414e6..13df6e4bf 100644
--- a/resources/eez-framework-amalgamation/eez-flow.h
+++ b/resources/eez-framework-amalgamation/eez-flow.h
@@ -1,4 +1,4 @@
-/* Autogenerated on November 16, 2024 4:57:49 PM from eez-framework commit 7a01ce78cb06c38d668e4873296b5652ec55b43f */
+/* Autogenerated on November 17, 2024 10:35:13 AM from eez-framework commit 3dee6f40927c74568901c8c97f3e16b4ecbb6051 */
 /*
  * eez-framework
  *