diff --git a/src-tauri/injection/postinject.ts b/src-tauri/injection/postinject.ts
index 77fe395..89bfdd2 100644
--- a/src-tauri/injection/postinject.ts
+++ b/src-tauri/injection/postinject.ts
@@ -21,14 +21,16 @@ const observer = new MutationObserver(() => {
 
     // Ensure top bar exists if we want it
     if (window.__DORION_CONFIG__.use_native_titlebar)
-      window.__TAURI__.webviewWindow.getCurrentWebviewWindow().setDecorations(true)
+      window.__TAURI__.core.invoke('set_decorations', { enable: true })
 
     // This needs to render after discord is loaded
     if (
       !window.__DORION_CONFIG__.use_native_titlebar &&
       !document.querySelector('#dorion_topbar')
-    )
+    ) {
+      window.__TAURI__.core.invoke('set_decorations', { enable: false })
       createTopBar()
+    }
 
     onClientLoad()
 
diff --git a/src-tauri/src/functionality/window.rs b/src-tauri/src/functionality/window.rs
index 6eb5a7a..5976e69 100644
--- a/src-tauri/src/functionality/window.rs
+++ b/src-tauri/src/functionality/window.rs
@@ -26,6 +26,11 @@ pub fn toggle_maximize(win: tauri::WebviewWindow) {
   }
 }
 
+#[tauri::command]
+pub fn set_decorations(win: tauri::WebviewWindow, enable: bool) {
+  win.set_decorations(enable).unwrap_or_default();
+}
+
 // Close
 #[tauri::command]
 pub fn close(win: tauri::WebviewWindow) {
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index ab05d7f..141bf94 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -118,6 +118,7 @@ fn main() {
       should_disable_plugins,
       functionality::window::minimize,
       functionality::window::toggle_maximize,
+      functionality::window::set_decorations,
       functionality::window::close,
       css_preprocess::clear_css_cache,
       css_preprocess::localize_imports,