diff --git a/app/plugins/CoreServer/templates/MatchServerAttributes/fields.inc b/app/plugins/CoreServer/templates/MatchServerAttributes/fields.inc
index 333c89e45..537d64c54 100644
--- a/app/plugins/CoreServer/templates/MatchServerAttributes/fields.inc
+++ b/app/plugins/CoreServer/templates/MatchServerAttributes/fields.inc
@@ -85,6 +85,16 @@
 
   function jsLocalOnLoad() {
     updateGadgets(true);
+
+    // On page load, set the appropriate widget to the current type (if set)
+    var curattr = "<?= \Cake\Utility\Inflector::Singularize(\Cake\Utility\Inflector::dasherize($vv_obj->attribute ?? '')) ?>";
+    var curtype = "<?= $vv_obj->type_id ?? ''?>";
+
+    if(curattr != "") {
+      curattr = curattr + "-type-id";
+
+      document.getElementById(curattr).value = curtype;
+    }
   }
 </script>
 <?php