diff --git a/bas-search.user.js b/bas-search.user.js
index b6b5f74..770546b 100644
--- a/bas-search.user.js
+++ b/bas-search.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         BAS - Quick Search
 // @namespace    http://tampermonkey.net/
-// @version      1.7.10
+// @version      1.7.11
 // @description  Quick search using `Ctrl` + `Shift` + `F` hotkey, group search with "g:" and person search with "p:" prefix. Navigate tabs with Ctrl + Left/Right keys. Navigate search results with up and down keys.
 // @author       Øyvind Nilsen (on@ntnu.no)
 // @match        https://bas.ntnu.no/*
@@ -454,12 +454,13 @@
     inputBox.addEventListener('keydown', function(event) {
         if (event.key === 'Enter') {
             const searchQuery = inputBox.value.trim();
+            const lowerSearchQuery = searchQuery.toLowerCase();
             let url;
 
-            if (searchQuery.toLowerCase().startsWith('g:')) {
+            if (lowerSearchQuery.startsWith('g:') || lowerSearchQuery.startsWith('g ')) {
                 const groupName = searchQuery.substring(2).trim();
                 url = `https://bas.ntnu.no/group/search/?name=${encodeURIComponent(groupName)}`;
-            } else if (searchQuery.toLowerCase().startsWith('p:')) {
+            } else if (lowerSearchQuery.startsWith('p:') || lowerSearchQuery.startsWith('p ')) {
                 const personName = searchQuery.substring(2).trim();
 
                 // Check if personName matches ISO date format (YYYY-MM-DD)
@@ -470,7 +471,10 @@
                     url = `https://bas.ntnu.no/person/search/?name=${encodeURIComponent(personName)}`;
                 }
             } else {
-                const accountName = searchQuery.toLowerCase().startsWith('a:') ? searchQuery.substring(2).trim() : searchQuery;
+                let accountName = searchQuery;
+                if (lowerSearchQuery.startsWith('a:') || lowerSearchQuery.startsWith('a ')) {
+                    accountName = searchQuery.substring(2).trim();
+                }
                 url = `https://bas.ntnu.no/account/search/?name=${encodeURIComponent(accountName)}`;
             }