diff --git a/src/App.vue b/src/App.vue
index c4d4ede..64f9b9b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,8 @@
 <template>
   <Notifications />
+  <GmTools v-if="gameStore.character?.role === 'gm'" />
+  <GmPanel v-if="gameStore.character?.role === 'gm'" />
+
   <component :is="currentScreen" />
 </template>
 
@@ -7,6 +10,8 @@
 import { useGameStore } from '@/stores/gameStore'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import Notifications from '@/components/utilities/Notifications.vue'
+import GmTools from '@/components/gameMaster/GmTools.vue'
+import GmPanel from '@/components/gameMaster/GmPanel.vue'
 import Login from '@/screens/Login.vue'
 import Characters from '@/screens/Characters.vue'
 import Game from '@/screens/Game.vue'
diff --git a/src/screens/Game.vue b/src/screens/Game.vue
index 872e9ef..6432a9e 100644
--- a/src/screens/Game.vue
+++ b/src/screens/Game.vue
@@ -1,8 +1,5 @@
 <template>
   <div class="flex justify-center items-center h-dvh relative">
-    <GmTools v-if="gameStore.character?.role === 'gm'" />
-    <GmPanel v-if="gameStore.character?.role === 'gm'" />
-
     <Game :config="gameConfig" @create="createGame">
       <Scene name="main" @preload="preloadScene" @create="createScene">
         <div v-if="isLoaded">
@@ -34,8 +31,6 @@ import Hud from '@/components/gui/Hud.vue'
 import Zone from '@/components/zone/Zone.vue'
 import Hotkeys from '@/components/gui/Hotkeys.vue'
 import Chat from '@/components/gui/Chat.vue'
-import GmTools from '@/components/gameMaster/GmTools.vue'
-import GmPanel from '@/components/gameMaster/GmPanel.vue'
 import Inventory from '@/components/gui/UserPanel.vue'
 import Effects from '@/components/Effects.vue'
 import { loadAssets } from '@/composables/zoneComposable'
diff --git a/src/screens/ZoneEditor.vue b/src/screens/ZoneEditor.vue
index ec7cfbb..239d036 100644
--- a/src/screens/ZoneEditor.vue
+++ b/src/screens/ZoneEditor.vue
@@ -1,8 +1,5 @@
 <template>
   <div class="flex justify-center items-center h-dvh relative">
-    <GmTools v-if="gameStore.character?.role === 'gm'" />
-    <GmPanel v-if="gameStore.character?.role === 'gm'" />
-
     <Game :config="gameConfig" @create="createGame">
       <Scene name="main" @preload="preloadScene" @create="createScene">
         <ZoneEditor v-if="isLoaded" :key="JSON.stringify(`${zoneEditorStore.zone?.id}_${zoneEditorStore.zone?.createdAt}_${zoneEditorStore.zone?.updatedAt}`)" />
@@ -18,9 +15,7 @@ import { ref, onBeforeUnmount } from 'vue'
 import { Game, Scene } from 'phavuer'
 import { useGameStore } from '@/stores/gameStore'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
-import GmTools from '@/components/gameMaster/GmTools.vue'
 import ZoneEditor from '@/components/gameMaster/zoneEditor/ZoneEditor.vue'
-import GmPanel from '@/components/gameMaster/GmPanel.vue'
 import { loadAssets } from '@/composables/zoneComposable'
 
 const gameStore = useGameStore()