diff --git a/apps/web-clipper/entrypoints/background/index.js b/apps/web-clipper/entrypoints/background/index.js
index ee92f709a5..b92bfdb724 100644
--- a/apps/web-clipper/entrypoints/background/index.js
+++ b/apps/web-clipper/entrypoints/background/index.js
@@ -1,4 +1,8 @@
+import TriliumServerFacade, { isDevEnv } from "./trilium_server_facade";
+
 export default defineBackground(() => {
+    const triliumServerFacade = new TriliumServerFacade();
+
     // Keyboard shortcuts
     chrome.commands.onCommand.addListener(async function (command) {
         if (command == "saveSelection") {
diff --git a/apps/web-clipper/trilium_server_facade.js b/apps/web-clipper/entrypoints/background/trilium_server_facade.js
similarity index 98%
rename from apps/web-clipper/trilium_server_facade.js
rename to apps/web-clipper/entrypoints/background/trilium_server_facade.js
index 6f46893e50..b53b548475 100644
--- a/apps/web-clipper/trilium_server_facade.js
+++ b/apps/web-clipper/entrypoints/background/trilium_server_facade.js
@@ -1,12 +1,12 @@
 const PROTOCOL_VERSION_MAJOR = 1;
 
-function isDevEnv() {
+export function isDevEnv() {
 	const manifest = browser.runtime.getManifest();
 
 	return manifest.name.endsWith('(dev)');
 }
 
-class TriliumServerFacade {
+export default class TriliumServerFacade {
 	constructor() {
 		this.triggerSearchForTrilium();
 
@@ -221,5 +221,3 @@ class TriliumServerFacade {
 			(absoff % 60).toString().padStart(2,'0'));
 	}
 }
-
-window.triliumServerFacade = new TriliumServerFacade();
diff --git a/apps/web-clipper/entrypoints/popup/popup.js b/apps/web-clipper/entrypoints/popup/popup.js
index eca8d790e1..be571e428a 100644
--- a/apps/web-clipper/entrypoints/popup/popup.js
+++ b/apps/web-clipper/entrypoints/popup/popup.js
@@ -2,6 +2,7 @@ console.log("Popup script loaded");
 
 async function sendMessage(message) {
     try {
+        console.log("Sending message", message);
         return await browser.runtime.sendMessage(message);
     }
     catch (e) {
diff --git a/apps/web-clipper/manifest.json b/apps/web-clipper/manifest.json
index fc7e5b9213..2a7b80fb41 100644
--- a/apps/web-clipper/manifest.json
+++ b/apps/web-clipper/manifest.json
@@ -26,8 +26,7 @@
   "background": {
     "scripts": [
       "lib/browser-polyfill.js",
-      "utils.js",
-      "trilium_server_facade.js"
+      "utils.js"
     ]
   },
   "commands": {