diff --git a/frontend/apps/artcraft/app/src/pages/PageScene/comps/ControlPanelSceneObject/ControlPanelSceneObject.tsx b/frontend/apps/artcraft/app/src/pages/PageScene/comps/ControlPanelSceneObject/ControlPanelSceneObject.tsx
index d323372a2f..2dab5e711f 100644
--- a/frontend/apps/artcraft/app/src/pages/PageScene/comps/ControlPanelSceneObject/ControlPanelSceneObject.tsx
+++ b/frontend/apps/artcraft/app/src/pages/PageScene/comps/ControlPanelSceneObject/ControlPanelSceneObject.tsx
@@ -1,5 +1,4 @@
 import { ChangeEvent, useContext, useEffect, useId, useState } from "react";
-import { useSignals } from "@preact/signals-react/runtime";
 import { Transition } from "@headlessui/react";
 import {
   faChevronDown,
@@ -9,7 +8,6 @@ import {
 } from "@fortawesome/pro-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
-import { objectPanel as objectPanelSignals } from "../../signals";
 import { EngineContext } from "~/pages/PageScene/contexts/EngineContext";
 import { InputVector } from "@storyteller/ui-input";
 import { Button } from "@storyteller/ui-button";
@@ -37,10 +35,10 @@ const defaultAxises: Record<string, string> = {
 };
 
 export const ControlPanelSceneObject = () => {
-  useSignals();
   const disableHotkeyInput = usePageSceneStore((s) => s.disableHotkeyInput);
   const enableHotkeyInput = usePageSceneStore((s) => s.enableHotkeyInput);
-  const { isShowing, currentObject } = objectPanelSignals;
+  const isShowing = usePageSceneStore((s) => s.objectPanelShowing);
+  const currentSceneObject = usePageSceneStore((s) => s.objectPanelCurrent);
 
   const editorEngine = useContext(EngineContext);
 
@@ -65,8 +63,6 @@ export const ControlPanelSceneObject = () => {
     setIsCollapsed(!isCollapsed);
   };
 
-  const currentSceneObject = currentObject.value;
-
   function localToEngine(xyz: Record<string, string>) {
     return {
       x: parseFloat(xyz.x),
@@ -180,7 +176,7 @@ export const ControlPanelSceneObject = () => {
   return (
     <Transition
       as="div"
-      show={isShowing.value}
+      show={isShowing}
       className={twMerge(
         "glass absolute bottom-16 right-0 mb-4 mr-4 flex h-fit w-56 origin-bottom-right flex-col gap-2 rounded-lg border border-ui-panel-border p-3.5 text-white shadow-lg",
       )}
diff --git a/frontend/apps/artcraft/app/src/pages/PageScene/engine/editor.ts b/frontend/apps/artcraft/app/src/pages/PageScene/engine/editor.ts
index c1542c2b72..f3187c2a24 100644
--- a/frontend/apps/artcraft/app/src/pages/PageScene/engine/editor.ts
+++ b/frontend/apps/artcraft/app/src/pages/PageScene/engine/editor.ts
@@ -30,7 +30,7 @@ import {
   signalScene,
 } from "~/signals";
 
-import { outlinerState, updateObjectPanel } from "../signals";
+import { outlinerState } from "../signals";
 import { SceneGenereationMetaData } from "../models/sceneGenerationMetadata";
 import { MediaUploadApi } from "~/Classes/ApiManager";
 import { SceneManager } from "./scene_manager_api";
@@ -1339,7 +1339,7 @@ class Editor {
     const scale = mainSelected.scale;
 
     // TODO this is a bug we need to only show when clicked on and use UPDATE when updating.
-    updateObjectPanel({
+    usePageSceneStore.getState().updateObjectPanel({
       group:
         mainSelected.name === this.camera_name
           ? ClipGroup.CAMERA
diff --git a/frontend/apps/artcraft/app/src/pages/PageScene/engine/helper.ts b/frontend/apps/artcraft/app/src/pages/PageScene/engine/helper.ts
index 773a81021f..6824d63323 100644
--- a/frontend/apps/artcraft/app/src/pages/PageScene/engine/helper.ts
+++ b/frontend/apps/artcraft/app/src/pages/PageScene/engine/helper.ts
@@ -3,7 +3,6 @@ import Editor from "./editor";
 import * as THREE from "three";
 import { XYZ } from "../datastructures/common";
 import { EditorStates } from "../enums";
-import { hideObjectPanel } from "../signals";
 import { usePageSceneStore } from "../PageSceneStore";
 
 export class SceneUtils {
@@ -173,7 +172,7 @@ export class SceneUtils {
           });
         }
 
-        hideObjectPanel();
+        usePageSceneStore.getState().hideObjectPanel();
         usePageSceneStore.getState().setEditorState(EditorStates.EDIT);
       }
     }
@@ -275,6 +274,6 @@ function removeObject3D(object3D) {
     usePageSceneStore.getState().removeSceneObject(uuid);
     this.editor.selected = undefined;
     this.editor.publishSelect();
-    hideObjectPanel();
+    usePageSceneStore.getState().hideObjectPanel();
   }
 }
diff --git a/frontend/apps/artcraft/app/src/pages/PageScene/engine/keybinds_controls.ts b/frontend/apps/artcraft/app/src/pages/PageScene/engine/keybinds_controls.ts
index 2d2e4dca60..b75e36d7e0 100644
--- a/frontend/apps/artcraft/app/src/pages/PageScene/engine/keybinds_controls.ts
+++ b/frontend/apps/artcraft/app/src/pages/PageScene/engine/keybinds_controls.ts
@@ -1,9 +1,5 @@
 import * as THREE from "three";
-import {
-  hideObjectPanel,
-  outlinerState,
-  showObjectPanel,
-} from "../signals";
+import { outlinerState } from "../signals";
 import { usePageSceneStore } from "../PageSceneStore";
 import {
   OrbitControls,
@@ -230,7 +226,7 @@ export class MouseControls {
     }
     this.transform_interaction = true;
     // Contact react land
-    showObjectPanel();
+    usePageSceneStore.getState().showObjectPanel();
     this.updateSelectedUI();
   }
 
@@ -449,7 +445,7 @@ export class MouseControls {
         return;
       } else if (this.selected && this.selected.length > 0) {
         this.removeTransformControls();
-        hideObjectPanel();
+        usePageSceneStore.getState().hideObjectPanel();
         usePageSceneStore.getState().setShowPoseControls(false);
       }
     }
@@ -609,7 +605,7 @@ export class MouseControls {
       this.selected = [];
       this.setSelected(this.selected);
       this.removeTransformControls();
-      hideObjectPanel();
+      usePageSceneStore.getState().hideObjectPanel();
       usePageSceneStore.getState().setShowPoseControls(false);
     }
 
diff --git a/frontend/apps/artcraft/app/src/pages/PageScene/signals/index.ts b/frontend/apps/artcraft/app/src/pages/PageScene/signals/index.ts
index 937c4d92f7..a09dbb8851 100644
--- a/frontend/apps/artcraft/app/src/pages/PageScene/signals/index.ts
+++ b/frontend/apps/artcraft/app/src/pages/PageScene/signals/index.ts
@@ -1,4 +1,3 @@
 export * from "./demoAssets";
 export * from "./engine";
-export * from "./objectPanel";
 export * from "./outliner";
diff --git a/frontend/apps/artcraft/app/src/pages/PageScene/signals/objectPanel/index.ts b/frontend/apps/artcraft/app/src/pages/PageScene/signals/objectPanel/index.ts
deleted file mode 100644
index 776c6c3148..0000000000
--- a/frontend/apps/artcraft/app/src/pages/PageScene/signals/objectPanel/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./objectPanel";
diff --git a/frontend/apps/artcraft/app/src/pages/PageScene/signals/objectPanel/objectPanel.ts b/frontend/apps/artcraft/app/src/pages/PageScene/signals/objectPanel/objectPanel.ts
deleted file mode 100644
index 345df60741..0000000000
--- a/frontend/apps/artcraft/app/src/pages/PageScene/signals/objectPanel/objectPanel.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { signal } from "@preact/signals-core";
-import { SceneObject } from "./types";
-
-export const objectPanel = {
-  isShowing: signal<boolean>(false),
-  currentObject: signal<SceneObject | undefined>(undefined),
-};
-
-export const showObjectPanel = (showObject?: SceneObject) => {
-  if (showObject) {
-    objectPanel.currentObject.value = showObject;
-  }
-  objectPanel.isShowing.value = true;
-};
-
-export const hideObjectPanel = () => {
-  objectPanel.isShowing.value = false;
-};
-
-export const updateObjectPanel = (updateObject: SceneObject) => {
-  objectPanel.currentObject.value = updateObject;
-};
diff --git a/frontend/apps/artcraft/app/src/pages/PageScene/signals/objectPanel/types.tsx b/frontend/apps/artcraft/app/src/pages/PageScene/signals/objectPanel/types.tsx
deleted file mode 100644
index 3786527b5c..0000000000
--- a/frontend/apps/artcraft/app/src/pages/PageScene/signals/objectPanel/types.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Simple3DVector } from "~/pages/PageScene/datastructures/common";
-import { ClipGroup } from "~/enums";
-
-export type ControlPanel = {
-  isShowing: boolean;
-  currentSceneObject: SceneObject;
-};
-export type SceneObject = {
-  group: ClipGroup; // TODO: add meta data to determine what it is a camera or a object or a character into prefab clips
-  object_uuid: string;
-  object_name: string;
-  version: string;
-  objectVectors: Simple3DVector;
-};