diff --git a/panel/src/components/Drawers/Drawer.vue b/panel/src/components/Drawers/Drawer.vue
index dc6e326e0a..8d37af5eeb 100644
--- a/panel/src/components/Drawers/Drawer.vue
+++ b/panel/src/components/Drawers/Drawer.vue
@@ -2,6 +2,7 @@
 	<portal v-if="visible" to="drawer">
 		<form
 			:class="$vnode.data.staticClass"
+			:aria-current="current"
 			class="k-drawer"
 			method="dialog"
 			@submit.prevent="$emit('submit')"
@@ -88,4 +89,9 @@ export default {
 	box-shadow: var(--drawer-shadow);
 	container-type: inline-size;
 }
+
+.k-drawer:not([aria-current="true"]) {
+	display: none;
+	pointer-events: none;
+}
 </style>
diff --git a/panel/src/components/Drawers/FiberDrawer.vue b/panel/src/components/Drawers/FiberDrawer.vue
index 3d008a6a63..4ee6245aed 100644
--- a/panel/src/components/Drawers/FiberDrawer.vue
+++ b/panel/src/components/Drawers/FiberDrawer.vue
@@ -6,7 +6,8 @@
 			:key="drawer.id"
 			v-bind="isCurrent(drawer.id) ? $panel.drawer.props : drawer.props"
 			:breadcrumb="$panel.drawer.breadcrumb"
-			:visible="isCurrent(drawer.id) === true"
+			:current="isCurrent(drawer.id) === true"
+			:visible="true"
 			v-on="isCurrent(drawer.id) ? $panel.drawer.listeners() : drawer.on"
 		/>
 	</div>
diff --git a/panel/src/mixins/drawer.js b/panel/src/mixins/drawer.js
index c2df7600f0..71f5a887cf 100644
--- a/panel/src/mixins/drawer.js
+++ b/panel/src/mixins/drawer.js
@@ -10,6 +10,13 @@ import { props as Header } from "@/components/Drawers/Elements/Header.vue";
 export default {
 	mixins: [Header],
 	props: {
+		/**
+		 * @internal
+		 */
+		current: {
+			default: true,
+			type: Boolean
+		},
 		/**
 		 * The default icon for the drawer header
 		 */