diff --git a/src/app/components/favorite-libraries/favorite-libraries.component.ts b/src/app/components/favorite-libraries/favorite-libraries.component.ts
index db2f192a0..980bbcb45 100644
--- a/src/app/components/favorite-libraries/favorite-libraries.component.ts
+++ b/src/app/components/favorite-libraries/favorite-libraries.component.ts
@@ -62,6 +62,7 @@ export class FavoriteLibrariesComponent extends PageComponent
     this.subscriptions = this.subscriptions.concat([
       this.content.libraryDeleted.subscribe(() => this.reloadList()),
       this.content.libraryUpdated.subscribe(() => this.reloadList()),
+      this.content.libraryJoined.subscribe(() => this.reloadList()),
       this.content.favoriteLibraryToggle.subscribe(() => this.reloadList()),
 
       this.breakpointObserver
diff --git a/src/app/components/search/search-libraries-results/search-libraries-results.component.html b/src/app/components/search/search-libraries-results/search-libraries-results.component.html
index 94a8dde01..7e2c9f76a 100644
--- a/src/app/components/search/search-libraries-results/search-libraries-results.component.html
+++ b/src/app/components/search/search-libraries-results/search-libraries-results.component.html
@@ -30,6 +30,7 @@
 
               <adf-document-list
                   #documentList
+                  acaContextActions
                   acaDocumentList
                   [showHeader]="true"
                   [selectionMode]="'single'"
diff --git a/src/app/components/search/search-results.module.ts b/src/app/components/search/search-results.module.ts
index e813dec42..b28786f65 100644
--- a/src/app/components/search/search-results.module.ts
+++ b/src/app/components/search/search-results.module.ts
@@ -35,6 +35,7 @@ import { AppToolbarModule } from '../toolbar/toolbar.module';
 import { AppCommonModule } from '../common/common.module';
 import { DirectivesModule } from '../../directives/directives.module';
 import { AppLayoutModule } from '../layout/layout.module';
+import { ContextMenuModule } from '../context-menu/context-menu.module';
 
 @NgModule({
   imports: [
@@ -45,7 +46,8 @@ import { AppLayoutModule } from '../layout/layout.module';
     AppInfoDrawerModule,
     AppToolbarModule,
     DirectivesModule,
-    AppLayoutModule
+    AppLayoutModule,
+    ContextMenuModule
   ],
   declarations: [
     SearchResultsComponent,
diff --git a/src/app/components/toolbar/toggle-join-library/toggle-join-library.component.ts b/src/app/components/toolbar/toggle-join-library/toggle-join-library.component.ts
index 06fdbd9f4..2210b096b 100644
--- a/src/app/components/toolbar/toggle-join-library/toggle-join-library.component.ts
+++ b/src/app/components/toolbar/toggle-join-library/toggle-join-library.component.ts
@@ -39,8 +39,7 @@ import {
   selector: 'app-toggle-join-library',
   template: `
     <button
-      mat-icon-button
-      [color]="'primary'"
+      mat-menu-item
       #membership="libraryMembership"
       (toggle)="onToggleEvent($event)"
       (error)="onErrorEvent($event)"
@@ -57,8 +56,29 @@ import {
         svgIcon="join_library"
         style="pointer-events: none;"
       ></mat-icon>
+      <span class="sideLabel">{{
+        (membership.isJoinRequested | async)
+          ? ('APP.ACTIONS.CANCEL_JOIN' | translate)
+          : ('APP.ACTIONS.JOIN' | translate)
+      }}</span>
     </button>
   `,
+  styles: [
+    `
+      aca-toolbar-action .app-toggle-join-library .sideLabel {
+        display: none;
+      }
+
+      aca-toolbar-action .app-toggle-join-library .mat-menu-item mat-icon {
+        padding: 0;
+        margin: 0;
+      }
+
+      .adf-toolbar .app-toggle-join-library .mat-menu-item:hover {
+        background: none;
+      }
+    `
+  ],
   encapsulation: ViewEncapsulation.None,
   host: { class: 'app-toggle-join-library' }
 })
diff --git a/src/assets/app.extensions.json b/src/assets/app.extensions.json
index 6dcf0c746..9011c73ec 100644
--- a/src/assets/app.extensions.json
+++ b/src/assets/app.extensions.json
@@ -640,6 +640,15 @@
           "visible": "app.libraries.toolbar"
         }
       },
+      {
+        "id": "app.context.menu.joinLibrary",
+        "type": "custom",
+        "order": 603,
+        "component": "app.toolbar.toggleJoinLibrary",
+        "rules": {
+          "visible": "app.libraries.toolbar.canToggleJoin"
+        }
+      },
       {
         "id": "app.context.menu.copy",
         "title": "APP.ACTIONS.COPY",
@@ -1323,7 +1332,7 @@
         },
         {
           "id": "app.libraries.name",
-          "key": "name",
+          "key": "title",
           "title": "APP.DOCUMENT_LIST.COLUMNS.NAME",
           "type": "text",
           "class": "adf-data-table-cell--ellipsis__name",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 194a226b6..6911550d4 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -200,7 +200,7 @@
             "PRINT": "Print",
             "FULLSCREEN": "Activate full-screen mode",
             "JOIN": "Join",
-            "CANCEL_JOIN": "Cancel join request"
+            "CANCEL_JOIN": "Cancel join"
         },
         "DIALOGS": {
             "CONFIRM_PURGE": {