diff --git a/apps/browser/src/popup/components/pop-out.component.ts b/apps/browser/src/popup/components/pop-out.component.ts
index ee1929ce39..94a4b3a8de 100644
--- a/apps/browser/src/popup/components/pop-out.component.ts
+++ b/apps/browser/src/popup/components/pop-out.component.ts
@@ -18,7 +18,10 @@ export class PopOutComponent implements OnInit {
 
   ngOnInit() {
     if (this.show) {
-      if (this.popupUtilsService.inSidebar(window) && this.platformUtilsService.isFirefox()) {
+      if (
+        (this.popupUtilsService.inSidebar(window) && this.platformUtilsService.isFirefox()) ||
+        this.popupUtilsService.inPopout(window)
+      ) {
         this.show = false;
       }
     }
diff --git a/apps/browser/src/popup/scss/base.scss b/apps/browser/src/popup/scss/base.scss
index e816521f0e..8465a1ba33 100644
--- a/apps/browser/src/popup/scss/base.scss
+++ b/apps/browser/src/popup/scss/base.scss
@@ -215,6 +215,7 @@ header {
 
   app-pop-out {
     display: flex;
+    padding-right: 0.5em;
   }
 
   .title {
diff --git a/apps/browser/src/popup/vault/current-tab.component.html b/apps/browser/src/popup/vault/current-tab.component.html
index 0556e0d564..f4cfd9f4bc 100644
--- a/apps/browser/src/popup/vault/current-tab.component.html
+++ b/apps/browser/src/popup/vault/current-tab.component.html
@@ -1,7 +1,7 @@
 <header>
   <h1 class="sr-only">{{ "currentTab" | i18n }}</h1>
   <div class="left">
-    <app-pop-out [show]="!inSidebar"></app-pop-out>
+    <app-pop-out *ngIf="!inSidebar"></app-pop-out>
     <button
       type="button"
       appBlurClick