diff --git a/.idea/daedalus.iml b/.idea/daedalus.iml
deleted file mode 100644
index 198021c44..000000000
--- a/.idea/daedalus.iml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/daedalus_client_new/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/apps/daedalus_client/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/packages/daedalus/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/apps/app-playground/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/apps/app/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/apps/labrinth/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/apps/labrinth/tests" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/packages/app-lib/src" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c73594817..aa7113fc6 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/daedalus.iml" filepath="$PROJECT_DIR$/.idea/daedalus.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/code.iml" filepath="$PROJECT_DIR$/.idea/code.iml" />
     </modules>
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/apps/app-frontend/src/components/ui/friends/FriendsList.vue b/apps/app-frontend/src/components/ui/friends/FriendsList.vue
index 9ba4acc31..958da5b7e 100644
--- a/apps/app-frontend/src/components/ui/friends/FriendsList.vue
+++ b/apps/app-frontend/src/components/ui/friends/FriendsList.vue
@@ -157,20 +157,19 @@ const unlisten = await friend_listener(() => loadFriends())
 onUnmounted(() => {
   unlisten()
 })
-// TODO: Remove friends menu
 </script>
 
 <template>
   <NewModal ref="manageFriendsModal" header="Manage friends">
     <p v-if="acceptedFriends.length === 0">You have no friends :C</p>
-    <div v-else class="flex flex-col gap-4">
-      <input type="text" placeholder="Search friends..." class="w-full" />
+    <div v-else class="flex flex-col gap-4 min-w-[20rem]">
+      <input v-model="search" type="text" placeholder="Search friends..." class="w-full" />
       <div
-        v-for="friend in acceptedFriends.filter((x) =>
-          x.username.toLowerCase().includes(search.value),
+        v-for="friend in acceptedFriends.filter(
+          (x) => !search || x.username.toLowerCase().includes(search),
         )"
         :key="friend.username"
-        class="flex gap-2 items-center min-w-[20rem]"
+        class="flex gap-2 items-center"
       >
         <div class="relative">
           <Avatar :src="friend.avatar" class="w-12 h-12 rounded-full" size="2.25rem" circle />
diff --git a/packages/app-lib/src/state/friends.rs b/packages/app-lib/src/state/friends.rs
index 299833c1e..1cd214039 100644
--- a/packages/app-lib/src/state/friends.rs
+++ b/packages/app-lib/src/state/friends.rs
@@ -206,6 +206,13 @@ impl FriendsSocket {
         tokio::task::spawn(async move {
             let res = async {
                 let state = crate::State::get().await?;
+
+                {
+                    if state.friends_socket.write.lock().await.is_some() {
+                        return Ok(());
+                    }
+                }
+
                 state
                     .friends_socket
                     .connect(