diff --git a/package-lock.json b/package-lock.json
index e36934af..958147fb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
         "qrcode-generator": "^1.4.4",
         "qrcode-reader": "^1.0.4",
         "uuid": "^3.4.0",
-        "vue": "^2.6.12",
+        "vue": "^2.7.16",
         "vue2-dragula": "^2.5.4",
         "vuex": "^3.4.0"
       },
@@ -32,7 +32,6 @@
         "@types/uuid": "^3.4.9",
         "@typescript-eslint/eslint-plugin": "^2.34.0",
         "@typescript-eslint/parser": "^2.34.0",
-        "@vue/runtime-dom": "^3.2.47",
         "@vue/test-utils": "^1.1.1",
         "base64-loader": "^1.0.0",
         "buffer": "^6.0.3",
@@ -58,7 +57,7 @@
         "util": "^0.12.5",
         "vue-loader": "^15.10.1",
         "vue-svg-loader": "^0.16.0",
-        "vue-template-compiler": "^2.7.0",
+        "vue-template-compiler": "^2.7.16",
         "webpack": "^5.11.0",
         "webpack-cli": "^5.0.0",
         "webpack-merge": "^5.0.0"
@@ -1010,13 +1009,16 @@
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "2.7.14",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz",
-      "integrity": "sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==",
+      "version": "2.7.16",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
+      "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
       "dependencies": {
-        "@babel/parser": "^7.18.4",
+        "@babel/parser": "^7.23.5",
         "postcss": "^8.4.14",
         "source-map": "^0.6.1"
+      },
+      "optionalDependencies": {
+        "prettier": "^1.18.2 || ^2.0.0"
       }
     },
     "node_modules/@vue/component-compiler-utils": {
@@ -1077,48 +1079,6 @@
       "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
       "dev": true
     },
-    "node_modules/@vue/reactivity": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.47.tgz",
-      "integrity": "sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ==",
-      "dev": true,
-      "dependencies": {
-        "@vue/shared": "3.2.47"
-      }
-    },
-    "node_modules/@vue/runtime-core": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.47.tgz",
-      "integrity": "sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA==",
-      "dev": true,
-      "dependencies": {
-        "@vue/reactivity": "3.2.47",
-        "@vue/shared": "3.2.47"
-      }
-    },
-    "node_modules/@vue/runtime-dom": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.47.tgz",
-      "integrity": "sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA==",
-      "dev": true,
-      "dependencies": {
-        "@vue/runtime-core": "3.2.47",
-        "@vue/shared": "3.2.47",
-        "csstype": "^2.6.8"
-      }
-    },
-    "node_modules/@vue/runtime-dom/node_modules/csstype": {
-      "version": "2.6.21",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz",
-      "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==",
-      "dev": true
-    },
-    "node_modules/@vue/shared": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.47.tgz",
-      "integrity": "sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ==",
-      "dev": true
-    },
     "node_modules/@vue/test-utils": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.3.4.tgz",
@@ -6768,7 +6728,7 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz",
       "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==",
-      "dev": true,
+      "devOptional": true,
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -8602,11 +8562,12 @@
       "dev": true
     },
     "node_modules/vue": {
-      "version": "2.7.14",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.14.tgz",
-      "integrity": "sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==",
+      "version": "2.7.16",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
+      "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
+      "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
       "dependencies": {
-        "@vue/compiler-sfc": "2.7.14",
+        "@vue/compiler-sfc": "2.7.16",
         "csstype": "^3.1.0"
       }
     },
@@ -8746,9 +8707,9 @@
       }
     },
     "node_modules/vue-template-compiler": {
-      "version": "2.7.14",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz",
-      "integrity": "sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==",
+      "version": "2.7.16",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz",
+      "integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==",
       "dev": true,
       "dependencies": {
         "de-indent": "^1.0.2",
diff --git a/package.json b/package.json
index 088dde83..bb9b2754 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
     "@types/uuid": "^3.4.9",
     "@typescript-eslint/eslint-plugin": "^2.34.0",
     "@typescript-eslint/parser": "^2.34.0",
-    "@vue/runtime-dom": "^3.2.47",
     "@vue/test-utils": "^1.1.1",
     "base64-loader": "^1.0.0",
     "buffer": "^6.0.3",
@@ -60,7 +59,7 @@
     "util": "^0.12.5",
     "vue-loader": "^15.10.1",
     "vue-svg-loader": "^0.16.0",
-    "vue-template-compiler": "^2.7.0",
+    "vue-template-compiler": "^2.7.16",
     "webpack": "^5.11.0",
     "webpack-cli": "^5.0.0",
     "webpack-merge": "^5.0.0"
@@ -73,7 +72,7 @@
     "qrcode-generator": "^1.4.4",
     "qrcode-reader": "^1.0.4",
     "uuid": "^3.4.0",
-    "vue": "^2.6.12",
+    "vue": "^2.7.16",
     "vue2-dragula": "^2.5.4",
     "vuex": "^3.4.0"
   }
diff --git a/src/background.ts b/src/background.ts
index 30b95a15..73be3f77 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -3,7 +3,12 @@ import { Encryption } from "./models/encryption";
 import { EntryStorage, ManagedStorage } from "./models/storage";
 import { Dropbox, Drive, OneDrive } from "./models/backup";
 import * as uuid from "uuid/v4";
-import { getSiteName, getMatchedEntries, getCurrentTab } from "./utils";
+import {
+  getSiteName,
+  getMatchedEntries,
+  getCurrentTab,
+  okToInjectContentScript,
+} from "./utils";
 import { CodeState } from "./models/otp";
 
 import { getOTPAuthPerLineFromOPTAuthMigration } from "./models/migration";
@@ -456,7 +461,7 @@ chrome.commands.onCommand.addListener(async (command: string) => {
       }
 
       tab = await getCurrentTab();
-      if (tab.id) {
+      if (okToInjectContentScript(tab)) {
         await chrome.scripting.executeScript({
           target: { tabId: tab.id },
           files: ["/dist/content.js"],
@@ -473,7 +478,7 @@ chrome.commands.onCommand.addListener(async (command: string) => {
 
     case "autofill":
       tab = await getCurrentTab();
-      if (tab.id) {
+      if (okToInjectContentScript(tab)) {
         await chrome.scripting.executeScript({
           target: { tabId: tab.id },
           files: ["/dist/content.js"],
diff --git a/src/components/Popup/AddMethodPage.vue b/src/components/Popup/AddMethodPage.vue
index 5fb0bee5..ca63065f 100644
--- a/src/components/Popup/AddMethodPage.vue
+++ b/src/components/Popup/AddMethodPage.vue
@@ -14,7 +14,7 @@
 </template>
 <script lang="ts">
 import Vue from "vue";
-import { getCurrentTab } from "../../utils";
+import { getCurrentTab, okToInjectContentScript } from "../../utils";
 export default Vue.extend({
   methods: {
     showInfo(page: string) {
@@ -33,7 +33,7 @@ export default Vue.extend({
 
       // Insert content script
       const tab = await getCurrentTab();
-      if (tab.id) {
+      if (okToInjectContentScript(tab)) {
         await chrome.scripting.executeScript({
           target: { tabId: tab.id },
           files: ["/dist/content.js"],
diff --git a/src/components/Popup/EntryComponent.vue b/src/components/Popup/EntryComponent.vue
index e1cfd8fb..92099b5b 100644
--- a/src/components/Popup/EntryComponent.vue
+++ b/src/components/Popup/EntryComponent.vue
@@ -90,7 +90,7 @@ import { mapState } from "vuex";
 import * as QRGen from "qrcode-generator";
 import { OTPEntry, OTPType, CodeState, OTPAlgorithm } from "../../models/otp";
 import { EntryStorage } from "../../models/storage";
-import { getCurrentTab } from "../../utils";
+import { getCurrentTab, okToInjectContentScript } from "../../utils";
 
 import IconMinusCircle from "../../../svg/minus-circle.svg";
 import IconRedo from "../../../svg/redo.svg";
@@ -223,13 +223,12 @@ export default Vue.extend({
             if (this.$store.state.menu.useAutofill) {
               await insertContentScript();
               const tab = await getCurrentTab();
-              if (!tab || !tab.id) {
-                return;
+              if (tab && tab.id) {
+                chrome.tabs.sendMessage(tab.id, {
+                  action: "pastecode",
+                  code: entry.code,
+                });
               }
-              chrome.tabs.sendMessage(tab.id, {
-                action: "pastecode",
-                code: entry.code,
-              });
             }
 
             const lastActiveElement = document.activeElement as HTMLElement;
@@ -296,8 +295,8 @@ function getQrUrl(entry: OTPEntry) {
 }
 
 async function insertContentScript() {
-  const tab = await getCurrentTab();
-  if (tab.id) {
+  let tab = await getCurrentTab();
+  if (okToInjectContentScript(tab)) {
     await chrome.scripting.executeScript({
       target: { tabId: tab.id },
       files: ["/dist/content.js"],
diff --git a/src/components/Popup/MainHeader.vue b/src/components/Popup/MainHeader.vue
index a05ccd00..d6f8f323 100644
--- a/src/components/Popup/MainHeader.vue
+++ b/src/components/Popup/MainHeader.vue
@@ -74,7 +74,7 @@
 <script lang="ts">
 import Vue from "vue";
 import { mapState } from "vuex";
-import { getCurrentTab } from "../../utils";
+import { getCurrentTab, okToInjectContentScript } from "../../utils";
 
 // Icons
 import IconCog from "../../../svg/cog.svg";
@@ -160,7 +160,7 @@ export default Vue.extend({
 
       const tab = await getCurrentTab();
       // Insert content script
-      if (tab.id) {
+      if (okToInjectContentScript(tab)) {
         await chrome.scripting.executeScript({
           target: { tabId: tab.id },
           files: ["/dist/content.js"],
diff --git a/src/utils.ts b/src/utils.ts
index 77fe7aed..508f0650 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -143,3 +143,20 @@ export async function getCurrentTab() {
   const [tab] = await chrome.tabs.query(queryOptions);
   return tab;
 }
+
+interface TabWithIdAndURL extends chrome.tabs.Tab {
+  id: number;
+  url: string;
+}
+
+export function okToInjectContentScript(
+  tab: chrome.tabs.Tab
+): tab is TabWithIdAndURL {
+  return (
+    tab.id !== undefined &&
+    tab.url !== undefined &&
+    (tab.url.startsWith("https://") ||
+      tab.url.startsWith("http://") ||
+      tab.url.startsWith("file://"))
+  );
+}