diff --git a/jslib b/jslib
index 20389402..dc0befc9 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 20389402fc6610ffeaa003cfc663a41dc1061100
+Subproject commit dc0befc9be805af687328b7f28c25f840b2aa733
diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index bf690c89..e99fa8c7 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -194,7 +194,7 @@
                                     {{'autofillDetection' | i18n}} {{(i + 1)}}
                                 </label>
                                 <select id="loginUriMatch{{i}}" name="Login.Uris[{{i}}].Match" [(ngModel)]="u.match"
-                                        [hidden]="!u.showOptions">
+                                        [hidden]="u.showOptions === false || (u.showOptions == null && u.match == null)">
                                     <option *ngFor="let o of uriMatchOptions" [ngValue]="o.value">{{o.name}}</option>
                                 </select>
                             </div>
diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts
index b911e636..0133399c 100644
--- a/src/app/vault/add-edit.component.ts
+++ b/src/app/vault/add-edit.component.ts
@@ -258,7 +258,7 @@ export class AddEditComponent implements OnChanges {
 
     toggleUriOptions(uri: LoginUriView) {
         const u = (uri as any);
-        u.showOptions = !u.showOptions;
+        u.showOptions = u.showOptions == null && uri.match != null ? false : !u.showOptions;
     }
 
     async checkPassword() {