diff --git a/surfsense_desktop/src/main.ts b/surfsense_desktop/src/main.ts
index e0a6c3be5..a7a12c485 100644
--- a/surfsense_desktop/src/main.ts
+++ b/surfsense_desktop/src/main.ts
@@ -1,37 +1,10 @@
-import { app, BrowserWindow, shell, ipcMain, session, dialog, clipboard, Menu } from 'electron';
+import { app, BrowserWindow, shell, ipcMain, session, dialog, Menu } from 'electron';
 import path from 'path';
 import { getPort } from 'get-port-please';
 import { autoUpdater } from 'electron-updater';
+import { registerGlobalErrorHandlers, showErrorDialog } from './modules/errors';
 
-function showErrorDialog(title: string, error: unknown): void {
-  const err = error instanceof Error ? error : new Error(String(error));
-  console.error(`${title}:`, err);
-
-  if (app.isReady()) {
-    const detail = err.stack || err.message;
-    const buttonIndex = dialog.showMessageBoxSync({
-      type: 'error',
-      buttons: ['OK', process.platform === 'darwin' ? 'Copy Error' : 'Copy error'],
-      defaultId: 0,
-      noLink: true,
-      message: title,
-      detail,
-    });
-    if (buttonIndex === 1) {
-      clipboard.writeText(`${title}\n${detail}`);
-    }
-  } else {
-    dialog.showErrorBox(title, err.stack || err.message);
-  }
-}
-
-process.on('uncaughtException', (error) => {
-  showErrorDialog('Unhandled Error', error);
-});
-
-process.on('unhandledRejection', (reason) => {
-  showErrorDialog('Unhandled Promise Rejection', reason);
-});
+registerGlobalErrorHandlers();
 
 const isDev = !app.isPackaged;
 let mainWindow: BrowserWindow | null = null;
diff --git a/surfsense_desktop/src/modules/errors.ts b/surfsense_desktop/src/modules/errors.ts
new file mode 100644
index 000000000..ab9f7088c
--- /dev/null
+++ b/surfsense_desktop/src/modules/errors.ts
@@ -0,0 +1,33 @@
+import { app, clipboard, dialog } from 'electron';
+
+export function showErrorDialog(title: string, error: unknown): void {
+  const err = error instanceof Error ? error : new Error(String(error));
+  console.error(`${title}:`, err);
+
+  if (app.isReady()) {
+    const detail = err.stack || err.message;
+    const buttonIndex = dialog.showMessageBoxSync({
+      type: 'error',
+      buttons: ['OK', process.platform === 'darwin' ? 'Copy Error' : 'Copy error'],
+      defaultId: 0,
+      noLink: true,
+      message: title,
+      detail,
+    });
+    if (buttonIndex === 1) {
+      clipboard.writeText(`${title}\n${detail}`);
+    }
+  } else {
+    dialog.showErrorBox(title, err.stack || err.message);
+  }
+}
+
+export function registerGlobalErrorHandlers(): void {
+  process.on('uncaughtException', (error) => {
+    showErrorDialog('Unhandled Error', error);
+  });
+
+  process.on('unhandledRejection', (reason) => {
+    showErrorDialog('Unhandled Promise Rejection', reason);
+  });
+}