diff --git a/src/ThreeEditor/components/Sidebar/EditorSidebar.tsx b/src/ThreeEditor/components/Sidebar/EditorSidebar.tsx
index 39000f8a4..b233a6aea 100644
--- a/src/ThreeEditor/components/Sidebar/EditorSidebar.tsx
+++ b/src/ThreeEditor/components/Sidebar/EditorSidebar.tsx
@@ -116,6 +116,7 @@ export function EditorSidebar(props: { editor: Editor }) {
 					<SidebarTree
 						editor={editor}
 						sources={[editor.zoneManager.worldZone]}
+						dragDisabled
 					/>
 					<Divider sx={{ marginBottom: t => t.spacing(1) }} />
 					<SidebarTree
diff --git a/src/ThreeEditor/components/Sidebar/SidebarTree/SidebarTree.tsx b/src/ThreeEditor/components/Sidebar/SidebarTree/SidebarTree.tsx
index aa3c947dc..bafe7544b 100644
--- a/src/ThreeEditor/components/Sidebar/SidebarTree/SidebarTree.tsx
+++ b/src/ThreeEditor/components/Sidebar/SidebarTree/SidebarTree.tsx
@@ -7,14 +7,16 @@ import { SimulationElement } from '../../../Simulation/Base/SimulationElement';
 import { SidebarTreeItem, TreeItem } from './SidebarTreeItem';
 import { Divider } from '@mui/material';
 import { hasVisibleChildren } from '../../../../util/hooks/useKeyboardEditorControls';
-import { isQuantity } from '../../../Simulation/Scoring/ScoringQuantity';
 import { ChangeObjectOrderCommand } from '../../../js/commands/ChangeObjectOrderCommand';
-import { isWorldZone } from '../../../Simulation/Zones/WorldZone/WorldZone';
 import { generateUUID } from 'three/src/math/MathUtils';
 
 type TreeSource = (Object3D[] | Object3D)[];
 
-export function SidebarTree(props: { editor: Editor; sources: TreeSource }) {
+export function SidebarTree(props: {
+	editor: Editor;
+	sources: TreeSource;
+	dragDisabled?: boolean;
+}) {
 	const { editor, sources } = props;
 
 	const treeRef = useRef<TreeMethods>(null);
@@ -90,20 +92,12 @@ export function SidebarTree(props: { editor: Editor; sources: TreeSource }) {
 
 	const objectRefs = useRef<Map<string, HTMLDivElement>>(new Map());
 
-	const canDrop = (
-		source: TreeItem | undefined,
-		target: TreeItem | undefined,
-		dropTargetId: string | number
-	): boolean => {
+	const canDrop = (source: TreeItem | undefined, dropTargetId: string | number): boolean => {
 		if (!source) return false;
 
 		if (source.data?.treeId !== treeId) return false;
 
-		const object3d = source.data?.object;
-
-		if (isQuantity(object3d)) return object3d.parent === target?.data?.object;
-
-		return source.parent === dropTargetId;
+		return source.parent === dropTargetId; // only allow drop on same parent
 	};
 
 	return (
@@ -137,10 +131,10 @@ export function SidebarTree(props: { editor: Editor; sources: TreeSource }) {
 					);
 				}
 			}}
-			canDrop={(_, { dropTarget, dragSource, dropTargetId }) => {
-				return canDrop(dragSource, dropTarget, dropTargetId);
+			canDrop={(_, { dragSource, dropTargetId }) => {
+				return canDrop(dragSource, dropTargetId);
 			}}
-			canDrag={node => !isWorldZone(node?.data?.object)}
+			canDrag={node => !props.dragDisabled}
 			sort={false}
 			insertDroppableFirst={false}
 			dropTargetOffset={5}