diff --git a/themes/fid_bbi/scss/blocks/form.scss b/themes/fid_bbi/scss/blocks/form.scss
index 23264e416522182b7900720f23884e279556ef85..14a36d3abccf1211a88f66051d54162a43f7d5e5 100644
--- a/themes/fid_bbi/scss/blocks/form.scss
+++ b/themes/fid_bbi/scss/blocks/form.scss
@@ -157,3 +157,17 @@
   @extend label;
   flex: 1;
 }
+
+.form-edit-list {
+  fieldset {
+    border: 0;
+    float: none;
+    padding: 0;
+    width: 100%;
+  }
+  legend {
+    color: $black;
+    font-size: inherit;
+    width: 30%;
+  }
+}
diff --git a/themes/fid_bbi/templates/myresearch/editlist.phtml b/themes/fid_bbi/templates/myresearch/editlist.phtml
index 243dbaefdce2f098c0bdc2c12b8b46ad7da6389f..d86923dec7bac566090a845b0da328aef7cb856c 100644
--- a/themes/fid_bbi/templates/myresearch/editlist.phtml
+++ b/themes/fid_bbi/templates/myresearch/editlist.phtml
@@ -55,35 +55,20 @@ $this->headTitle($this->translate($pageTitle));
     <input type="hidden" name="public" value="0">
   <?php else: ?>
     <div class="form-group">
-      <div class="form-label" id="access-label">
-        <?=$this->translate('Access')?>
-      </div>
-      <div class="form-inputs" aria-labelledby="access-label">
-        <p>
-          <input
-            id="list_public_1"
-            type="radio"
-            name="public"
-            value="1"
-            <?=$this->list->isPublic() ? 'checked' : ''?>
-          >
-          <label for="list_public_1">
-            <?=$this->translate('Public')?>
+      <?php /* refs #19837 improve favorite edit list - GG */ ?>
+      <fieldset>
+        <legend><?=$this->transEsc('Access') ?></legend>
+        <div class="radio inline">
+          <label>
+            <input id="list_public_1" type="radio" name="public" value="1"<?php if ($this->list->isPublic()): ?> checked="checked"<?php endif; ?>/> <?=$this->transEsc('Public') ?>
           </label>
-        </p>
-        <p>
-          <input
-            id="list_public_0"
-            type="radio"
-            name="public"
-            value="0"
-            <?=!$this->list->isPublic() ? 'checked' : ''?>
-          >
-          <label for="list_public_0">
-            <?=$this->translate('Private')?>
+        </div>
+        <div class="radio inline">
+          <label>
+            <input id="list_public_0" type="radio" name="public" value="0"<?php if (!$this->list->isPublic()): ?> checked="checked"<?php endif; ?>/> <?=$this->transEsc('Private') ?>
           </label>
-        </p>
-      </div>
+        </div>
+      </fieldset>
     </div>
   <?php endif; ?>