diff --git a/src/SEQTA.ts b/src/SEQTA.ts
index 6e785866..002ff296 100644
--- a/src/SEQTA.ts
+++ b/src/SEQTA.ts
@@ -2196,7 +2196,6 @@ async function GetLessonColours() {
 
 export function CreateCustomShortcutDiv(element: any) {
   // Creates the stucture and element information for each seperate shortcut
-  console.log(`[BetterSEQTA+] Adding shortcut: ${element.name}`)
   var shortcut = document.createElement('a')
   shortcut.setAttribute('href', element.url)
   shortcut.setAttribute('target', '_blank')
@@ -2232,6 +2231,8 @@ export function CreateCustomShortcutDiv(element: any) {
 }
 
 export function RemoveShortcutDiv(elements: any) {
+  if (elements.length === 0) return
+  
   elements.forEach((element: any) => {
     const shortcuts = document.querySelectorAll('.shortcut')
     shortcuts.forEach((shortcut) => {
@@ -2377,21 +2378,19 @@ async function loadHomePage() {
   })
 
   // Adds the shortcuts to the shortcut container
-  const result = browser.storage.local.get(['shortcuts'])
-  function open (result: any) {
-
-    const shortcuts = Object.values(result)[0]
-    addShortcuts(shortcuts)
-  }
-  result.then(open, onError)
+  const result = await browser.storage.local.get(['shortcuts'])
+  
+  const shortcuts = Object.values(result)[0]
+  addShortcuts(shortcuts)
+  AddCustomShortcutsToPage()
 
   // Creates the upcoming container and appends to the home container
-  var upcomingcontainer = document.createElement('div')
+  const upcomingcontainer = document.createElement('div')
   upcomingcontainer.classList.add('upcoming-container')
   upcomingcontainer.classList.add('border')
 
-  let upcomingtitlediv = CreateElement('div', 'upcoming-title')
-  let upcomingtitle = document.createElement('h2')
+  const upcomingtitlediv = CreateElement('div', 'upcoming-title')
+  const upcomingtitle = document.createElement('h2')
   upcomingtitle.classList.add('home-subtitle')
   upcomingtitle.innerText = 'Upcoming Assessments'
   upcomingtitlediv.append(upcomingtitle)
@@ -2405,7 +2404,7 @@ async function loadHomePage() {
 
   upcomingcontainer.append(upcomingtitlediv)
 
-  let upcomingitems = document.createElement('div')
+  const upcomingitems = document.createElement('div')
   upcomingitems.id = 'upcoming-items'
   upcomingitems.classList.add('upcoming-items')
 
@@ -2675,7 +2674,6 @@ export function addShortcuts(shortcuts: any) {
       }
     }
   }
-  AddCustomShortcutsToPage()
 }
 
 export function enableNotificationCollector() {
diff --git a/src/interface/pages/Shortcuts.tsx b/src/interface/pages/Shortcuts.tsx
index 5771d369..e2952863 100644
--- a/src/interface/pages/Shortcuts.tsx
+++ b/src/interface/pages/Shortcuts.tsx
@@ -37,7 +37,7 @@ const Shortcuts = memo(() => {
     if (isValidTitle(newTitle) && isValidURL(newURL)) {
       const newShortcut: CustomShortcut = { name: newTitle.trim(), url: formatUrl(newURL).trim(), icon: newTitle[0] };
       const updatedCustomShortcuts = [...settingsState.customshortcuts, newShortcut];
-      setSettingsState(prevState => ({ ...prevState, updatedCustomShortcuts }));
+      setSettingsState({ ...settingsState, customshortcuts: updatedCustomShortcuts });
 
       setNewTitle("");
       setNewURL("");
@@ -45,7 +45,7 @@ const Shortcuts = memo(() => {
       setFormVisible(false);
     } else {
       // Replace with a more user-friendly way to display errors
-      console.error("Please enter a valid title and URL.");
+      alert("Please enter a valid title and URL.");
     }
   }, [newTitle, newURL, isValidTitle, isValidURL, setSettingsState]);
 
diff --git a/src/seqta/utils/listeners/StorageListener.ts b/src/seqta/utils/listeners/StorageListener.ts
index 382adc8a..4e81b698 100644
--- a/src/seqta/utils/listeners/StorageListener.ts
+++ b/src/seqta/utils/listeners/StorageListener.ts
@@ -133,7 +133,7 @@ export default class StorageListener {
       );
 
       if (removedElement) {
-        RemoveShortcutDiv(removedElement);
+        RemoveShortcutDiv([ removedElement ]);
       }
     }
   }