diff --git a/src/popup/components/action-buttons.component.ts b/src/popup/components/action-buttons.component.ts
index 909d20b8e25..605ca6f63ab 100644
--- a/src/popup/components/action-buttons.component.ts
+++ b/src/popup/components/action-buttons.component.ts
@@ -29,6 +29,7 @@ import { PopupUtilsService } from '../services/popup-utils.service';
 })
 export class ActionButtonsComponent {
     @Output() onView = new EventEmitter<CipherView>();
+    @Output() onLaunch = new EventEmitter<CipherView>();
     @Input() cipher: CipherView;
     @Input() showView = false;
 
@@ -45,15 +46,7 @@ export class ActionButtonsComponent {
     }
 
     launch() {
-        if (this.cipher.type !== CipherType.Login || !this.cipher.login.canLaunch) {
-            return;
-        }
-
-        this.analytics.eventTrack.next({ action: 'Launched URI From Listing' });
-        BrowserApi.createNewTab(this.cipher.login.launchUri);
-        if (this.popupUtilsService.inPopup(window)) {
-            BrowserApi.closePopup(window);
-        }
+        this.onLaunch.emit(this.cipher);
     }
 
     async copy(cipher: CipherView, value: string, typeI18nKey: string, aType: string) {
diff --git a/src/popup/components/ciphers-list.component.html b/src/popup/components/ciphers-list.component.html
index 33c585ad1f3..39217fe5c13 100644
--- a/src/popup/components/ciphers-list.component.html
+++ b/src/popup/components/ciphers-list.component.html
@@ -17,6 +17,7 @@
             <span class="detail">{{c.subTitle}}</span>
         </div>
     </div>
-    <app-action-buttons [cipher]="c" [showView]="showView" (onView)="viewCipher(c)" class="action-buttons">
+    <app-action-buttons [cipher]="c" [showView]="showView" (onView)="viewCipher(c)" (onLaunch)="doubleSelectCipher(c)" 
+        class="action-buttons">
     </app-action-buttons>
 </a>