diff --git a/src/views/DiscoverView.vue b/src/views/DiscoverView.vue
index bf547d6..6612a02 100644
--- a/src/views/DiscoverView.vue
+++ b/src/views/DiscoverView.vue
@@ -86,7 +86,7 @@
     </div>
 
     <!-- Results List -->
-    <InfiniteScroll @reached-bottom="loadMoreData" v-if="!isChoosingSearchBox">
+    <InfiniteScroll @reached-bottom="loadMoreData">
       <ul>
         <li
           class="border-b border-slate-300"
@@ -156,7 +156,6 @@ export default class DiscoverView extends Vue {
   apiServer = "";
   searchTerms = "";
   projects: ProjectData[] = [];
-  isChoosingSearchBox = false;
   isLocalActive = true;
   isRemoteActive = false;
   localCount = 0;
@@ -180,7 +179,13 @@ export default class DiscoverView extends Vue {
     const allAccounts = await accountsDB.accounts.toArray();
     this.allMyDids = allAccounts.map((acc) => acc.did);
 
-    this.searchLocal();
+    if (this.searchBox) {
+      await this.searchLocal();
+    } else {
+      this.isLocalActive = false;
+      this.isRemoteActive = true;
+      await this.searchAll();
+    }
   }
 
   public async buildHeaders(): Promise<HeadersInit> {
diff --git a/src/views/SearchAreaView.vue b/src/views/SearchAreaView.vue
index 04dc243..a536fe3 100644
--- a/src/views/SearchAreaView.vue
+++ b/src/views/SearchAreaView.vue
@@ -214,6 +214,7 @@ export default class DiscoverView extends Vue {
           },
           -1,
         );
+        this.$router.back();
       } catch (err) {
         this.$notify(
           {