diff --git a/frontend/src/lib/components/apps/editor/ComponentEditor.svelte b/frontend/src/lib/components/apps/editor/ComponentEditor.svelte
index 3025ff10ce..275ff85d9e 100644
--- a/frontend/src/lib/components/apps/editor/ComponentEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/ComponentEditor.svelte
@@ -43,9 +43,13 @@
 
 	<div
 		on:pointerdown={(e) => {
-			if ($mode === 'preview') {
-				e?.stopPropagation()
-			}
+			// Removed in https://github.com/windmill-labs/windmill/pull/1171
+			// In case of a bug, try stopping propagation on the native event
+			// and dispatch a custom event: `e?.stopPropagation(); dispatch('select');`
+
+			// if ($mode === 'preview') {
+			// 	e?.stopPropagation()
+			// }
 		}}
 		class={classNames(
 			'border h-full bg-white',
diff --git a/frontend/src/lib/components/apps/editor/GridEditor.svelte b/frontend/src/lib/components/apps/editor/GridEditor.svelte
index eaba61912e..05bee72a7f 100644
--- a/frontend/src/lib/components/apps/editor/GridEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/GridEditor.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { getContext } from 'svelte'
+	import { getContext, afterUpdate } from 'svelte'
 	import type { AppEditorContext } from '../types'
 	import Grid from 'svelte-grid'
 	import ComponentEditor from './ComponentEditor.svelte'
@@ -100,6 +100,20 @@
 	const onpointerup = () => {
 		pointerdown = false
 	}
+
+	afterUpdate(() => {
+		if($selectedComponent) {
+			const parents = document.querySelectorAll<HTMLElement>('.svlt-grid-item')
+			parents.forEach((parent) => {
+				const hasActiveChild = !!parent.querySelector('.active-grid-item')
+				if(hasActiveChild) {
+					parent.style.setProperty('z-index', '100')
+				} else {
+					parent.style.removeProperty('z-index')
+				}
+			})
+		}
+	})
 </script>
 
 <div class="pb-2 relative z-20">
@@ -149,11 +163,10 @@
 					{/if}
 					<!-- svelte-ignore a11y-click-events-have-key-events -->
 					<div
-						on:pointerdown={() => {
-							selectComponent(dataItem.data.id)
-						}}
+						on:pointerdown={() => selectComponent(dataItem.data.id)}
 						class={classNames(
-							'h-full w-full flex justify-center align-center items-center',
+							'h-full w-full center-center',
+							$selectedComponent === dataItem.data.id ? 'active-grid-item' : '',
 							gridComponent.data.card ? 'border border-gray-100' : ''
 						)}
 					>
@@ -191,12 +204,12 @@
 	{/each}
 {/if}
 
-<style>
-	:global(.svlt-grid-shadow) {
+<style global>
+	.svlt-grid-shadow {
 		/* Back shadow */
-		background: rgb(147 197 253) !important;
+		background: #93c4fdd0 !important;
 	}
-	:global(.svlt-grid-active) {
+	.svlt-grid-active {
 		opacity: 1 !important;
 	}
 </style>
diff --git a/frontend/tailwind.config.cjs b/frontend/tailwind.config.cjs
index 98b6420424..eee918e035 100644
--- a/frontend/tailwind.config.cjs
+++ b/frontend/tailwind.config.cjs
@@ -244,7 +244,6 @@ const config = {
 					padding: `${theme('spacing.1')} ${theme('spacing.2')}`,
 					border: `1px solid ${theme('colors.gray.300')}`,
 					borderRadius: theme('borderRadius.md'),
-					boxShadow: theme('boxShadow.sm'),
 					'&:focus': {
 						'--tw-ring-color': theme('colors.indigo.100'),
 						'--tw-ring-offset-shadow':