diff --git a/src/lib/model-editor/EditViewVoxel.svelte b/src/lib/model-editor/EditViewVoxel.svelte
index f1a5bb1..e880d16 100644
--- a/src/lib/model-editor/EditViewVoxel.svelte
+++ b/src/lib/model-editor/EditViewVoxel.svelte
@@ -14,6 +14,9 @@
 	scale={voxel.scale.toArray()}
 	onclick={(e) => {
 		e.stopPropagation();
+
+		if(!modelEditor.orbitControlsEnabled) return;
+
 		if (modelEditor.tool === 'delete') {
 			//editorState.cubes.splice(index, 1);
 			deleteVoxel(voxel.id);
diff --git a/src/lib/model-editor/Floor.svelte b/src/lib/model-editor/Floor.svelte
index f0be08c..0fb55fd 100644
--- a/src/lib/model-editor/Floor.svelte
+++ b/src/lib/model-editor/Floor.svelte
@@ -10,11 +10,8 @@
 <T.Mesh
 	rotation.x={-Math.PI / 2}
 	onclick={(e) => {
-		console.log(e.point, modelEditor.tool);
-		e.stopPropagation();
 		if (modelEditor.tool !== 'place') return;
-
-		console.log(e.point);
+		e.stopPropagation();
 
 		addVoxel(
 			[e.point.x, e.point.y + 0.5, e.point.z],
@@ -28,8 +25,9 @@
 		modelEditor.ghostPosition = [e.point.x, e.point.y + 0.5, e.point.z];
 	}}
 	onpointermove={(e) => {
-		e.stopPropagation();
 		if (modelEditor.tool !== 'place') return;
+		e.stopPropagation();
+		
 		modelEditor.ghostPosition = [e.point.x, e.point.y + 0.5, e.point.z];
 	}}
 	onpointerleave={() => {
diff --git a/src/lib/model-editor/ModelEditorUI.svelte b/src/lib/model-editor/ModelEditorUI.svelte
index 806988d..b539c55 100644
--- a/src/lib/model-editor/ModelEditorUI.svelte
+++ b/src/lib/model-editor/ModelEditorUI.svelte
@@ -58,8 +58,8 @@
 	let selectedTool = $state(modelEditor.tool);
 </script>
 
-<div class="absolute top-2 left-2">
-	<div class="bg-base-100 flex gap-4 rounded-2xl p-2">
+<div class="absolute top-2 right-2">
+	<div class="bg-base-100 flex gap-4 rounded-2xl p-2 px-3">
 		<!-- add cube -->
 		<Toggle
 			bind:pressed={
@@ -172,6 +172,8 @@
 				</svg>
 			</ToggleGroupItem>
 		</ToggleGroup>
+
+		<PopoverColorPicker bind:rgb={modelEditor.color} />
 	</div>
 </div>
 
@@ -188,10 +190,6 @@
 	</Button>
 </div>
 
-<div class="absolute top-3 right-3 z-10">
-	<PopoverColorPicker bind:rgb={modelEditor.color} />
-</div>
-
 <!-- delete from public model list -->
 {#if dev}
 	<Button
diff --git a/src/lib/model-editor/TransformingVoxel.svelte b/src/lib/model-editor/TransformingVoxel.svelte
index 14da421..f37ba3d 100644
--- a/src/lib/model-editor/TransformingVoxel.svelte
+++ b/src/lib/model-editor/TransformingVoxel.svelte
@@ -17,7 +17,15 @@
 		quaternion={voxel.quaternion.toArray()}
 		scale={voxel.scale.toArray()}
 		onchange={() => {
-			modelEditor.orbitControlsEnabled = !(modelEditor.transformControls?.dragging ?? true);
+			let enabled = !(modelEditor.transformControls?.dragging ?? true);
+
+			if(!enabled) {
+				modelEditor.orbitControlsEnabled = false;
+			} else if(modelEditor.orbitControlsEnabled === false) {
+				setTimeout(() => {
+					modelEditor.orbitControlsEnabled = true;
+				}, 200);
+			}
 		}}
 	>
 		<T.Mesh>
diff --git a/src/lib/world-editor/WorldEditorScene.svelte b/src/lib/world-editor/WorldEditorScene.svelte
index 05e56de..e9267f7 100644
--- a/src/lib/world-editor/WorldEditorScene.svelte
+++ b/src/lib/world-editor/WorldEditorScene.svelte
@@ -27,7 +27,8 @@
 		window.addEventListener('keydown', (e) => {
 			if (
 				e.target instanceof HTMLInputElement ||
-				(e.target instanceof HTMLElement && e.target.contentEditable === 'true')
+				(e.target instanceof HTMLElement && e.target.contentEditable === 'true') ||
+				editingState.showModelEditor
 			)
 				return;