diff --git a/src/stores/search.js b/src/stores/search.js
index 6f922b2d..d2b43355 100644
--- a/src/stores/search.js
+++ b/src/stores/search.js
@@ -125,8 +125,17 @@ export const useSearchStore = defineStore('Search', () => {
             return;
         }
 
+        if (query.length < 2) {
+            state.quickSearchItems = quickSearchUserHistory();
+            return;
+        }
+
         const results = [];
         const cleanQuery = removeWhitespace(query);
+        if (!cleanQuery) {
+            state.quickSearchItems = quickSearchUserHistory();
+            return;
+        }
 
         for (const ctx of friendStore.friends.values()) {
             if (typeof ctx.ref === 'undefined') {
diff --git a/src/views/Sidebar/components/FriendsSidebar.vue b/src/views/Sidebar/components/FriendsSidebar.vue
index e9dd09aa..531d5507 100644
--- a/src/views/Sidebar/components/FriendsSidebar.vue
+++ b/src/views/Sidebar/components/FriendsSidebar.vue
@@ -139,7 +139,7 @@
             <el-icon class="rotation-transition" :class="{ 'is-rotated': isActiveFriends }"><ArrowRight /></el-icon>
             <span style="margin-left: 5px">{{ t('side_panel.active') }} &horbar; {{ activeFriends.length }}</span>
         </div>
-        <div v-show="isActiveFriends">
+        <div v-if="isActiveFriends">
             <friend-item
                 v-for="friend in activeFriends"
                 :key="friend.id"
@@ -157,7 +157,7 @@
             <el-icon class="rotation-transition" :class="{ 'is-rotated': isOfflineFriends }"><ArrowRight /></el-icon>
             <span style="margin-left: 5px">{{ t('side_panel.offline') }} &horbar; {{ offlineFriends.length }}</span>
         </div>
-        <div v-show="isOfflineFriends">
+        <div v-if="isOfflineFriends">
             <friend-item
                 v-for="friend in offlineFriends"
                 :key="friend.id"