diff --git a/api/include/MoreTabs.hpp b/api/include/MoreTabs.hpp
index a14aff1a..6c436665 100644
--- a/api/include/MoreTabs.hpp
+++ b/api/include/MoreTabs.hpp
@@ -4,6 +4,12 @@
 #include <Geode/modify/EditorUI.hpp>
 #include <Geode/binding/EditButtonBar.hpp>
 #include <Geode/utils/cocos.hpp>
+#include <Geode/binding/CCMenuItemToggler.hpp>
+#include <Geode/binding/EditButtonBar.hpp>
+#include <Geode/binding/GameManager.hpp>
+#include <Geode/binding/CCMenuItemSpriteExtra.hpp>
+#include <Geode/modify/EditorUI.hpp>
+#include <geode.custom-keybinds/include/Keybinds.hpp>
 
 using namespace geode::prelude;
 
diff --git a/api/src/MoreTabs.cpp b/api/src/MoreTabs.cpp
index 36d5155b..2ab5aae6 100644
--- a/api/src/MoreTabs.cpp
+++ b/api/src/MoreTabs.cpp
@@ -1,10 +1,4 @@
 #include <MoreTabs.hpp>
-#include <Geode/binding/CCMenuItemToggler.hpp>
-#include <Geode/binding/EditButtonBar.hpp>
-#include <Geode/binding/GameManager.hpp>
-#include <Geode/binding/CCMenuItemSpriteExtra.hpp>
-#include <Geode/modify/EditorUI.hpp>
-#include <geode.custom-keybinds/include/Keybinds.hpp>
 
 using namespace keybinds;
 using namespace editor_api;
diff --git a/src/features/StartPosSwitcher/StartPosButtonBar.cpp b/src/features/StartPosSwitcher/StartPosButtonBar.cpp
index 4ba1e313..3fbdda0b 100644
--- a/src/features/StartPosSwitcher/StartPosButtonBar.cpp
+++ b/src/features/StartPosSwitcher/StartPosButtonBar.cpp
@@ -141,6 +141,7 @@ void StartPosButtonBar::onNext(CCObject*) {
 
     StartPosManager::get()->next();
     this->setStartPosCounters();
+    editor_api::moveGameLayerTo(m_editor->m_editorUI, StartPosManager::get()->getStartPosFromPoint(StartPosManager::get()->getActive()));
 }
 
 void StartPosButtonBar::onPrevious(CCObject*) {
@@ -150,4 +151,8 @@ void StartPosButtonBar::onPrevious(CCObject*) {
 
     StartPosManager::get()->previous();
     this->setStartPosCounters();
+    if (StartPosManager::get()->getActive() == CCPointZero) {
+        return;
+    }
+    editor_api::moveGameLayerTo(m_editor->m_editorUI, StartPosManager::get()->getStartPosFromPoint(StartPosManager::get()->getActive()));
 }
\ No newline at end of file
diff --git a/src/features/StartPosSwitcher/StartPosButtonBar.hpp b/src/features/StartPosSwitcher/StartPosButtonBar.hpp
index 8ad2eae0..c0b32596 100644
--- a/src/features/StartPosSwitcher/StartPosButtonBar.hpp
+++ b/src/features/StartPosSwitcher/StartPosButtonBar.hpp
@@ -3,6 +3,7 @@
 #include <Geode/Geode.hpp>
 #include <vector>
 #include <algorithm>
+#include <Utils.hpp>
 
 #include "StartPosManager.hpp"