diff --git a/src/popup/scss/box.scss b/src/popup/scss/box.scss
index 8fdf812390..782952be16 100644
--- a/src/popup/scss/box.scss
+++ b/src/popup/scss/box.scss
@@ -120,11 +120,6 @@
         }
 
         .action-buttons {
-          &.count {
-            align-self: start;
-            margin-top: 10px;
-          }
-
           .row-btn {
             padding-left: 5px;
             padding-right: 5px;
@@ -260,7 +255,6 @@
     display: block;
     width: 100%;
     margin-bottom: 5px;
-    min-height: 1em;
 
     @include themify($themes) {
       color: themed("mutedColor");
@@ -311,7 +305,6 @@
   .row-main {
     flex-grow: 1;
     min-width: 0;
-    align-self: start;
   }
 
   &.box-content-row-flex,
@@ -462,9 +455,13 @@
 
   .action-buttons {
     display: flex;
-    align-self: start;
     margin-left: 5px;
 
+    &.action-buttons-fixed {
+      align-self: start;
+      margin-top: 2px;
+    }
+
     .row-btn {
       cursor: pointer;
       padding: 10px 8px;
diff --git a/src/popup/vault/view-custom-fields.component.html b/src/popup/vault/view-custom-fields.component.html
index 4cc7f74fa5..ebedd30776 100644
--- a/src/popup/vault/view-custom-fields.component.html
+++ b/src/popup/vault/view-custom-fields.component.html
@@ -38,7 +38,7 @@
           <span>{{ cipher.linkedFieldI18nKey(field.linkedId) | i18n }}</span>
         </div>
       </div>
-      <div class="action-buttons">
+      <div class="action-buttons action-buttons-fixed">
         <button
           type="button"
           class="row-btn"
diff --git a/src/popup/vault/view.component.html b/src/popup/vault/view.component.html
index 03ac81d44a..2a01296391 100644
--- a/src/popup/vault/view.component.html
+++ b/src/popup/vault/view.component.html
@@ -74,7 +74,7 @@
               [innerHTML]="cipher.login.password | colorPasswordCount"
             ></div>
           </div>
-          <div class="action-buttons">
+          <div class="action-buttons action-buttons-fixed">
             <button
               type="button"
               #checkPasswordBtn