diff --git a/apps/desktop/src/routes/+layout.svelte b/apps/desktop/src/routes/+layout.svelte
index dbb64de..0251e36 100644
--- a/apps/desktop/src/routes/+layout.svelte
+++ b/apps/desktop/src/routes/+layout.svelte
@@ -1,6 +1,17 @@
 <script lang="ts">
+	import { onMount } from "svelte"
 	import "../app.css"
 	import { ModeWatcher, ThemeWrapper } from "@kksh/svelte5"
+	import { dev } from "$app/environment"
+
+	onMount(() => {
+		if (!dev) {
+			document.addEventListener("contextmenu", function (event) {
+				event.preventDefault()
+				console.warn("contextmenu disabled in release mode", event)
+			})
+		}
+	})
 
 	let { children } = $props()
 </script>
diff --git a/packages/tauri-plugins/jarvis/src/commands/dev.rs b/packages/tauri-plugins/jarvis/src/commands/dev.rs
index fbdb80d..7760f64 100644
--- a/packages/tauri-plugins/jarvis/src/commands/dev.rs
+++ b/packages/tauri-plugins/jarvis/src/commands/dev.rs
@@ -2,54 +2,39 @@ use tauri::{Manager, Runtime};
 
 #[tauri::command]
 pub fn open_devtools<R: Runtime>(window: tauri::Window<R>) -> Result<(), String> {
-    #[cfg(debug_assertions)]
-    {
-        let win = window.get_webview_window(window.label());
-        if let Some(win) = win {
-            win.open_devtools();
-        }
+    let win = window.get_webview_window(window.label());
+    if let Some(win) = win {
+        win.open_devtools();
     }
     Ok(())
 }
 
 #[tauri::command]
 pub fn close_devtools<R: Runtime>(window: tauri::Window<R>) -> Result<(), String> {
-    #[cfg(debug_assertions)]
-    {
-        let win = window.get_webview_window(window.label());
-        if let Some(win) = win {
-            win.close_devtools();
-        }
+    let win = window.get_webview_window(window.label());
+    if let Some(win) = win {
+        win.close_devtools();
     }
     Ok(())
 }
 
 #[tauri::command]
 pub fn is_devtools_open<R: Runtime>(window: tauri::Window<R>) -> Result<bool, String> {
-    #[cfg(debug_assertions)]
-    {
-        let win = window.get_webview_window(window.label());
-        if let Some(win) = win {
-            Ok(win.is_devtools_open())
-        } else {
-            Err("Window not found".to_string())
-        }
+    let win = window.get_webview_window(window.label());
+    if let Some(win) = win {
+        Ok(win.is_devtools_open())
+    } else {
+        Err("Window not found".to_string())
     }
-    #[cfg(not(debug_assertions))]
-    Err("Devtools is not available in release mode".to_string())
 }
 
 #[tauri::command]
 pub fn toggle_devtools<R: Runtime>(window: tauri::Window<R>) -> Result<(), String> {
-    #[cfg(debug_assertions)]
-    {
-        let is_open =
-            is_devtools_open(window.clone()).expect("failed to check if devtools is open");
-        if is_open {
-            close_devtools(window).expect("failed to close devtools");
-        } else {
-            open_devtools(window).expect("failed to open devtools");
-        }
+    let is_open = is_devtools_open(window.clone()).expect("failed to check if devtools is open");
+    if is_open {
+        close_devtools(window).expect("failed to close devtools");
+    } else {
+        open_devtools(window).expect("failed to open devtools");
     }
     Ok(())
 }