diff --git a/Editor/src/Windows/PrefabEditor/PrefabEditorWindow.cpp b/Editor/src/Windows/PrefabEditor/PrefabEditorWindow.cpp
index 8e7870ac..892344d8 100644
--- a/Editor/src/Windows/PrefabEditor/PrefabEditorWindow.cpp
+++ b/Editor/src/Windows/PrefabEditor/PrefabEditorWindow.cpp
@@ -28,7 +28,8 @@
 using namespace Nuake;
 
 PrefabEditorWindow::PrefabEditorWindow(Ref<Prefab> inPrefab) :
-	prefab(inPrefab)
+	prefab(inPrefab),
+	SelectionPanel(CreateScope<EditorSelectionPanel>(Selection))
 {
 	const Vector2 defaultSize = Vector2{ 640, 360 };
 	viewportFramebuffer = CreateRef<FrameBuffer>(true, defaultSize);
@@ -50,7 +51,6 @@ PrefabEditorWindow::PrefabEditorWindow(Ref<Prefab> inPrefab) :
 	previewLight.SetCastShadows(true);
 	previewLight.SyncDirectionWithSky = true;
 	previewLight.Strength = 5.5f;
-
 }
 
 void PrefabEditorWindow::Update(float ts)
diff --git a/Editor/src/Windows/PrefabEditor/PrefabEditorWindow.h b/Editor/src/Windows/PrefabEditor/PrefabEditorWindow.h
index 0340ae14..e84e793b 100644
--- a/Editor/src/Windows/PrefabEditor/PrefabEditorWindow.h
+++ b/Editor/src/Windows/PrefabEditor/PrefabEditorWindow.h
@@ -36,7 +36,7 @@ private:
 	bool isRenaming;
 	bool isInitialized = false;
 
-	EditorSelectionPanel* SelectionPanel;
+	Scope<EditorSelectionPanel> SelectionPanel;
 	EditorSelection Selection;
 	Nuake::Entity QueueDeletion;
 	ImGuizmo::OPERATION CurrentOperation = ImGuizmo::TRANSLATE;