diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-list-filters/vault-list-filters.component.html b/apps/browser/src/vault/popup/components/vault-v2/vault-list-filters/vault-list-filters.component.html
index 0e241a81dc..d9c4fbeee1 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-list-filters/vault-list-filters.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-list-filters/vault-list-filters.component.html
@@ -1,8 +1,12 @@
 <div role="toolbar" [ariaLabel]="'filters' | i18n">
-  <form [formGroup]="filterForm" class="tw-flex tw-flex-wrap tw-gap-2 tw-mt-2">
+  <form
+    [formGroup]="filterForm"
+    class="tw-gap-2 tw-mt-2 tw-grid tw-grid-cols-2 sm:tw-grid-cols-3 lg:tw-grid-cols-4"
+  >
     <ng-container *ngIf="organizations$ | async as organizations">
       <bit-chip-select
         *ngIf="organizations.length"
+        fullWidth
         formControlName="organization"
         placeholderIcon="bwi-vault"
         [placeholderText]="'vault' | i18n"
@@ -13,6 +17,7 @@
     <ng-container *ngIf="collections$ | async as collections">
       <bit-chip-select
         *ngIf="collections.length"
+        fullWidth
         formControlName="collection"
         placeholderIcon="bwi-collection"
         [placeholderText]="'collection' | i18n"
@@ -23,6 +28,7 @@
     <ng-container *ngIf="folders$ | async as folders">
       <bit-chip-select
         *ngIf="folders.length"
+        fullWidth
         placeholderIcon="bwi-folder"
         formControlName="folder"
         [placeholderText]="'folder' | i18n"
@@ -32,6 +38,7 @@
     </ng-container>
     <bit-chip-select
       formControlName="cipherType"
+      fullWidth
       placeholderIcon="bwi-list"
       [placeholderText]="'type' | i18n"
       [options]="cipherTypes"