diff --git a/Editor/Source/Editor/Windows/EditorInterface.cpp b/Editor/Source/Editor/Windows/EditorInterface.cpp
index 68852335..80807b56 100644
--- a/Editor/Source/Editor/Windows/EditorInterface.cpp
+++ b/Editor/Source/Editor/Windows/EditorInterface.cpp
@@ -424,6 +424,8 @@ namespace Nuake {
                             PushCommand(SetGameState(GameState::Playing));
                             std::string statusMessage = ICON_FA_RUNNING + std::string(" Playing...");
                             SetStatusMessage(statusMessage.c_str(), Engine::GetProject()->Settings.PrimaryColor);
+
+                            GetFocusedSceneEditor()->SetScene(GetFocusedSceneEditor()->GetScene());
                         }
                     });
                 }
diff --git a/Editor/Source/Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp b/Editor/Source/Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp
index 1aa012fa..286265e7 100644
--- a/Editor/Source/Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp
+++ b/Editor/Source/Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp
@@ -195,7 +195,7 @@ void ViewportWidget::OnSceneChanged(Ref<Nuake::Scene> scene)
     vkRenderer.RemoveViewport(sceneViewport->GetID());
 
     // Create new viewport with same reoslution
-    const UUID viewId = editorContext.GetScene()->m_EditorCamera->ID;
+    const UUID viewId = editorContext.GetScene()->GetCurrentCamera()->ID;
     auto viewport = vkRenderer.CreateViewport(viewId, currentResolution);
     vkRenderer.RegisterSceneViewport(scene, viewport->GetID());