diff --git a/jslib b/jslib
index 6aef18ee7f5..20389402fc6 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 6aef18ee7f54fc5cfb042206eb27e76f2458b60a
+Subproject commit 20389402fc6610ffeaa003cfc663a41dc1061100
diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index 2a54a6c56c8..bf690c8934c 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -193,10 +193,17 @@
                                 <label for="loginUriMatch{{i}}" class="sr-only">
                                     {{'autofillDetection' | i18n}} {{(i + 1)}}
                                 </label>
-                                <select id="loginUriMatch{{i}}" name="Login.Uris[{{i}}].Match" [(ngModel)]="u.match">
+                                <select id="loginUriMatch{{i}}" name="Login.Uris[{{i}}].Match" [(ngModel)]="u.match"
+                                        [hidden]="!u.showOptions">
                                     <option *ngFor="let o of uriMatchOptions" [ngValue]="o.value">{{o.name}}</option>
                                 </select>
                             </div>
+                            <div class="action-buttons">
+                                <a class="row-btn" href="#" appStopClick appBlurClick
+                                   title="{{'toggleOptions' | i18n}}" (click)="toggleUriOptions(u)">
+                                    <i class="fa fa-lg fa-cog"></i>
+                                </a>
+                            </div>
                         </div>
                     </ng-container>
                     <a href="#" appStopClick appBlurClick (click)="addUri()" class="box-content-row">
diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts
index fedc5a69d15..b911e636bad 100644
--- a/src/app/vault/add-edit.component.ts
+++ b/src/app/vault/add-edit.component.ts
@@ -256,6 +256,11 @@ export class AddEditComponent implements OnChanges {
         f.showValue = !f.showValue;
     }
 
+    toggleUriOptions(uri: LoginUriView) {
+        const u = (uri as any);
+        u.showOptions = !u.showOptions;
+    }
+
     async checkPassword() {
         if (this.cipher.login == null || this.cipher.login.password == null || this.cipher.login.password === '') {
             return;
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 518db63d6a6..3f22a3294e6 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -1006,5 +1006,8 @@
   "defaultAutofillDetection": {
     "message": "Default auto-fill detection",
     "description": "Default URI auto-fill match detection."
+  },
+  "toggleOptions": {
+    "message": "Toggle Options"
   }
 }