diff --git a/src/wizard-dialog.ts b/src/wizard-dialog.ts
index 3034de1d1d..ce0bd67f07 100644
--- a/src/wizard-dialog.ts
+++ b/src/wizard-dialog.ts
@@ -357,7 +357,6 @@ export class WizardDialog extends LitElement {
             icon="code"
             label="${translate('save')}"
             trailingIcon
-            dialogInitialFocus
           ></mwc-button>`
         : page.primary
         ? html`<mwc-button
@@ -366,7 +365,6 @@ export class WizardDialog extends LitElement {
             icon="${page.primary.icon}"
             label="${page.primary.label}"
             trailingIcon
-            dialogInitialFocus
           ></mwc-button>`
         : index + 1 < (this.wizard?.length ?? 0)
         ? html`<mwc-button
diff --git a/test/integration/editors/communication/__snapshots__/subnetwork-editor-wizarding.test.snap.js b/test/integration/editors/communication/__snapshots__/subnetwork-editor-wizarding.test.snap.js
index 0c1f2978cb..822e4096b7 100644
--- a/test/integration/editors/communication/__snapshots__/subnetwork-editor-wizarding.test.snap.js
+++ b/test/integration/editors/communication/__snapshots__/subnetwork-editor-wizarding.test.snap.js
@@ -48,7 +48,6 @@ snapshots["subnetwork-editor wizarding integration edit/add Subnetwork wizard lo
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
diff --git a/test/integration/editors/templates/__snapshots__/datype-wizarding.test.snap.js b/test/integration/editors/templates/__snapshots__/datype-wizarding.test.snap.js
index 12f768de96..65c355d929 100644
--- a/test/integration/editors/templates/__snapshots__/datype-wizarding.test.snap.js
+++ b/test/integration/editors/templates/__snapshots__/datype-wizarding.test.snap.js
@@ -603,7 +603,6 @@ snapshots["DAType wizards defines a createDATypeWizard looks like the latest sna
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="add"
     label="[add]"
     slot="primaryAction"
@@ -772,7 +771,6 @@ snapshots["DAType wizards defines a dATypeWizard looks like the latest snapshot"
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="[save]"
     slot="primaryAction"
diff --git a/test/integration/editors/templates/__snapshots__/dotype-wizarding.test.snap.js b/test/integration/editors/templates/__snapshots__/dotype-wizarding.test.snap.js
index e08898ea6b..baba65e22e 100644
--- a/test/integration/editors/templates/__snapshots__/dotype-wizarding.test.snap.js
+++ b/test/integration/editors/templates/__snapshots__/dotype-wizarding.test.snap.js
@@ -706,7 +706,6 @@ snapshots["DOType wizards defines a createDOTypeWizard looks like the latest sna
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="add"
     label="[add]"
     slot="primaryAction"
@@ -1021,7 +1020,6 @@ snapshots["DOType wizards defines a dOTypeWizard looks like the latest snapshot"
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="[save]"
     slot="primaryAction"
@@ -1233,7 +1231,6 @@ snapshots["DOType wizards defines a sDOWizard to edit an existing SDO looks like
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="[save]"
     slot="primaryAction"
@@ -1419,7 +1416,6 @@ snapshots["DOType wizards defines a sDOWizard to create a new SDO element looks
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="[save]"
     slot="primaryAction"
diff --git a/test/integration/editors/templates/__snapshots__/enumtype-wizarding.test.snap.js b/test/integration/editors/templates/__snapshots__/enumtype-wizarding.test.snap.js
index 3738bd5271..4430049bfb 100644
--- a/test/integration/editors/templates/__snapshots__/enumtype-wizarding.test.snap.js
+++ b/test/integration/editors/templates/__snapshots__/enumtype-wizarding.test.snap.js
@@ -1355,7 +1355,6 @@ snapshots["EnumType wizards defines a createEnumTypeWizard looks like the latest
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="add"
     label="[add]"
     slot="primaryAction"
@@ -1515,7 +1514,6 @@ snapshots["EnumType wizards defines an eNumTypeEditWizard looks like the latest
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="[save]"
     slot="primaryAction"
@@ -1589,7 +1587,6 @@ snapshots["EnumType wizards defines a eNumValWizard to edit an existing EnumVal
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="Save"
     slot="primaryAction"
@@ -1639,7 +1636,6 @@ snapshots["EnumType wizards defines a eNumValWizard to create a new EnumVal elem
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="Save"
     slot="primaryAction"
diff --git a/test/integration/editors/templates/__snapshots__/lnodetype-wizard.test.snap.js b/test/integration/editors/templates/__snapshots__/lnodetype-wizard.test.snap.js
index ea297d5936..0265fe88d0 100644
--- a/test/integration/editors/templates/__snapshots__/lnodetype-wizard.test.snap.js
+++ b/test/integration/editors/templates/__snapshots__/lnodetype-wizard.test.snap.js
@@ -152,7 +152,6 @@ snapshots["LNodeType wizards defines a lNodeTypeHelperWizard looks like the late
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="[save]"
     slot="primaryAction"
@@ -4339,7 +4338,6 @@ snapshots["LNodeType wizards defines a createLNodeTypeWizard looks like the late
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="[next]..."
     slot="primaryAction"
@@ -4674,7 +4672,6 @@ snapshots["LNodeType wizards defines a createLNodeTypeWizard opens a createLNode
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="[save]"
     slot="primaryAction"
@@ -4874,7 +4871,6 @@ snapshots["LNodeType wizards defines a dOWizard to create a new DO element looks
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="[save]"
     slot="primaryAction"
diff --git a/test/integration/wizards/__snapshots__/bda-wizarding-editing.test.snap.js b/test/integration/wizards/__snapshots__/bda-wizarding-editing.test.snap.js
index 53a3fddf77..487c3616ff 100644
--- a/test/integration/wizards/__snapshots__/bda-wizarding-editing.test.snap.js
+++ b/test/integration/wizards/__snapshots__/bda-wizarding-editing.test.snap.js
@@ -618,7 +618,6 @@ snapshots["BDA wizarding editing integration defines a editBDaWizard to edit an
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="[save]"
     slot="primaryAction"
@@ -1155,7 +1154,6 @@ snapshots["BDA wizarding editing integration defines a createBDaWizard to create
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="[save]"
     slot="primaryAction"
diff --git a/test/integration/wizards/__snapshots__/da-wizarding-editing.test.snap.js b/test/integration/wizards/__snapshots__/da-wizarding-editing.test.snap.js
index edba9ec025..6ce8c450df 100644
--- a/test/integration/wizards/__snapshots__/da-wizarding-editing.test.snap.js
+++ b/test/integration/wizards/__snapshots__/da-wizarding-editing.test.snap.js
@@ -807,7 +807,6 @@ snapshots["DA wizarding editing integration defines a editDaWizard to edit an ex
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="[save]"
     slot="primaryAction"
@@ -1526,7 +1525,6 @@ snapshots["DA wizarding editing integration defines a createDaWizard to create a
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="[save]"
     slot="primaryAction"
diff --git a/test/integration/zeroline/__snapshots__/bay-editor-wizarding.test.snap.js b/test/integration/zeroline/__snapshots__/bay-editor-wizarding.test.snap.js
index 4738702beb..c31f05fce5 100644
--- a/test/integration/zeroline/__snapshots__/bay-editor-wizarding.test.snap.js
+++ b/test/integration/zeroline/__snapshots__/bay-editor-wizarding.test.snap.js
@@ -31,7 +31,6 @@ snapshots["bay-editor wizarding integration looks like the latest snapshot"] =
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="edit"
     label="[save]"
     slot="primaryAction"
diff --git a/test/integration/zeroline/__snapshots__/conducting-equipment-editor-wizarding.test.snap.js b/test/integration/zeroline/__snapshots__/conducting-equipment-editor-wizarding.test.snap.js
index 80d1ac9875..6ebd6b9a4b 100644
--- a/test/integration/zeroline/__snapshots__/conducting-equipment-editor-wizarding.test.snap.js
+++ b/test/integration/zeroline/__snapshots__/conducting-equipment-editor-wizarding.test.snap.js
@@ -47,7 +47,6 @@ snapshots["conducting-equipment-editor wizarding integration looks like the late
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="edit"
     label="[save]"
     slot="primaryAction"
diff --git a/test/integration/zeroline/__snapshots__/substation-editor-wizarding.test.snap.js b/test/integration/zeroline/__snapshots__/substation-editor-wizarding.test.snap.js
index 8d09bdfc93..70cefcf4b5 100644
--- a/test/integration/zeroline/__snapshots__/substation-editor-wizarding.test.snap.js
+++ b/test/integration/zeroline/__snapshots__/substation-editor-wizarding.test.snap.js
@@ -31,7 +31,6 @@ snapshots["substation-editor wizarding integration looks like the latest snapsho
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="edit"
     label="[save]"
     slot="primaryAction"
diff --git a/test/integration/zeroline/__snapshots__/voltage-level-editor-wizarding.test.snap.js b/test/integration/zeroline/__snapshots__/voltage-level-editor-wizarding.test.snap.js
index c416a02c52..62549f6cb7 100644
--- a/test/integration/zeroline/__snapshots__/voltage-level-editor-wizarding.test.snap.js
+++ b/test/integration/zeroline/__snapshots__/voltage-level-editor-wizarding.test.snap.js
@@ -63,7 +63,6 @@ snapshots["voltage-level-editor wizarding integration looks like the latest snap
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="edit"
     label="[save]"
     slot="primaryAction"
diff --git a/test/unit/editors/singlelinediagram/wizards/__snapshots__/bay.test.snap.js b/test/unit/editors/singlelinediagram/wizards/__snapshots__/bay.test.snap.js
index 3453a7d48e..124adfbc68 100644
--- a/test/unit/editors/singlelinediagram/wizards/__snapshots__/bay.test.snap.js
+++ b/test/unit/editors/singlelinediagram/wizards/__snapshots__/bay.test.snap.js
@@ -44,7 +44,6 @@ snapshots["Wizards for SCL element Bay (X/Y) looks like the latest snapshot"] =
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="edit"
     label="[save]"
     slot="primaryAction"
diff --git a/test/unit/editors/singlelinediagram/wizards/__snapshots__/conductingequipment.test.snap.js b/test/unit/editors/singlelinediagram/wizards/__snapshots__/conductingequipment.test.snap.js
index 15b559da76..c447123123 100644
--- a/test/unit/editors/singlelinediagram/wizards/__snapshots__/conductingequipment.test.snap.js
+++ b/test/unit/editors/singlelinediagram/wizards/__snapshots__/conductingequipment.test.snap.js
@@ -60,7 +60,6 @@ snapshots["Wizards for SCL element Conducting Equipment (X/Y) looks like the lat
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="edit"
     label="[save]"
     slot="primaryAction"
diff --git a/test/unit/editors/singlelinediagram/wizards/__snapshots__/powertransformer.test.snap.js b/test/unit/editors/singlelinediagram/wizards/__snapshots__/powertransformer.test.snap.js
index 44b492e988..e1743cca6e 100644
--- a/test/unit/editors/singlelinediagram/wizards/__snapshots__/powertransformer.test.snap.js
+++ b/test/unit/editors/singlelinediagram/wizards/__snapshots__/powertransformer.test.snap.js
@@ -50,7 +50,6 @@ snapshots["Wizards for SCL element Power Transformer (X/Y) looks like the latest
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="edit"
     label="[save]"
     slot="primaryAction"
diff --git a/test/unit/menu/__snapshots__/UpdateDescriptionSEL.test.snap.js b/test/unit/menu/__snapshots__/UpdateDescriptionSEL.test.snap.js
index b03320fac0..8025f0f645 100644
--- a/test/unit/menu/__snapshots__/UpdateDescriptionSEL.test.snap.js
+++ b/test/unit/menu/__snapshots__/UpdateDescriptionSEL.test.snap.js
@@ -131,7 +131,6 @@ snapshots["Update method for desc attributes in SEL IEDs working on SCL files co
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="Save"
     slot="primaryAction"
@@ -272,7 +271,6 @@ snapshots["Update method for desc attributes in SEL IEDs working on SCL files co
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="Save"
     slot="primaryAction"
diff --git a/test/unit/menu/__snapshots__/UpdateDescritionABB.test.snap.js b/test/unit/menu/__snapshots__/UpdateDescritionABB.test.snap.js
index 644af359d6..d18122fc06 100644
--- a/test/unit/menu/__snapshots__/UpdateDescritionABB.test.snap.js
+++ b/test/unit/menu/__snapshots__/UpdateDescritionABB.test.snap.js
@@ -19,7 +19,6 @@ snapshots["Update method for desc attributes in ABB IEDs working on SCL files wi
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
@@ -80,7 +79,6 @@ snapshots["Update method for desc attributes in ABB IEDs working on SCL files co
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/clientln.test.snap.js b/test/unit/wizards/__snapshots__/clientln.test.snap.js
index 2278cded35..affaeb0901 100644
--- a/test/unit/wizards/__snapshots__/clientln.test.snap.js
+++ b/test/unit/wizards/__snapshots__/clientln.test.snap.js
@@ -326,7 +326,6 @@ snapshots["clientln wizards createClientLnWizard looks like the latest snapshot"
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="[connect]"
     slot="primaryAction"
@@ -390,7 +389,6 @@ snapshots["clientln wizards selectClientLnWizard looks like the latest snapshot"
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="delete"
     label="[disconnect]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/connectedap-pattern.test.snap.js b/test/unit/wizards/__snapshots__/connectedap-pattern.test.snap.js
index 9759dec920..f147b883e3 100644
--- a/test/unit/wizards/__snapshots__/connectedap-pattern.test.snap.js
+++ b/test/unit/wizards/__snapshots__/connectedap-pattern.test.snap.js
@@ -118,7 +118,6 @@ snapshots["Edit wizard for SCL element ConnectedAP include an edit wizard that f
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
@@ -294,7 +293,6 @@ snapshots["Edit wizard for SCL element ConnectedAP include an edit wizard that f
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
@@ -533,7 +531,6 @@ snapshots["Edit wizard for SCL element ConnectedAP include an edit wizard that f
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/connectedap.test.snap.js b/test/unit/wizards/__snapshots__/connectedap.test.snap.js
index 272fc5804e..13dedc3131 100644
--- a/test/unit/wizards/__snapshots__/connectedap.test.snap.js
+++ b/test/unit/wizards/__snapshots__/connectedap.test.snap.js
@@ -69,7 +69,6 @@ snapshots["Wizards for SCL element ConnectedAP include a create wizard that look
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/controlwithiedname.test.snap.js b/test/unit/wizards/__snapshots__/controlwithiedname.test.snap.js
index 377d69d5f3..654fae05af 100644
--- a/test/unit/wizards/__snapshots__/controlwithiedname.test.snap.js
+++ b/test/unit/wizards/__snapshots__/controlwithiedname.test.snap.js
@@ -214,7 +214,6 @@ snapshots["selectExtRefWizard looks like the latest snapshot"] =
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="delete"
     label="[disconnect]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/dai.test.snap.js b/test/unit/wizards/__snapshots__/dai.test.snap.js
index 1c5a3ef5a1..5c6576ee13 100644
--- a/test/unit/wizards/__snapshots__/dai.test.snap.js
+++ b/test/unit/wizards/__snapshots__/dai.test.snap.js
@@ -25,7 +25,6 @@ snapshots["Wizards for SCL element DAI edit existing DAI looks like the latest s
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="edit"
     label="[save]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/dataset.test.snap.js b/test/unit/wizards/__snapshots__/dataset.test.snap.js
index 6d27e4a21e..9e112b223a 100644
--- a/test/unit/wizards/__snapshots__/dataset.test.snap.js
+++ b/test/unit/wizards/__snapshots__/dataset.test.snap.js
@@ -87,7 +87,6 @@ snapshots["dataset wizards include a dataset edit wizard looks like the latest s
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/fcda.test.snap.js b/test/unit/wizards/__snapshots__/fcda.test.snap.js
index d57831626f..df60f81d7c 100644
--- a/test/unit/wizards/__snapshots__/fcda.test.snap.js
+++ b/test/unit/wizards/__snapshots__/fcda.test.snap.js
@@ -19,7 +19,6 @@ snapshots["create wizard for FCDA element with a valid SCL file looks like the l
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="add"
     label="add"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/gse.test.snap.js b/test/unit/wizards/__snapshots__/gse.test.snap.js
index 5868f57be7..0481263709 100644
--- a/test/unit/wizards/__snapshots__/gse.test.snap.js
+++ b/test/unit/wizards/__snapshots__/gse.test.snap.js
@@ -61,7 +61,6 @@ snapshots["gse wizards editGseWizard looks like the latest snapshot"] =
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/gsecontrol.test.snap.js b/test/unit/wizards/__snapshots__/gsecontrol.test.snap.js
index 14752c4959..b5a664e543 100644
--- a/test/unit/wizards/__snapshots__/gsecontrol.test.snap.js
+++ b/test/unit/wizards/__snapshots__/gsecontrol.test.snap.js
@@ -61,7 +61,6 @@ snapshots["gsecontrol wizards selectGseControlWizard looks like the latest snaps
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="add"
     label="[GOOSE]"
     slot="primaryAction"
@@ -326,7 +325,6 @@ snapshots["gsecontrol wizards editGseControlWizard looks like the latest snapsho
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
@@ -560,7 +558,6 @@ snapshots["gsecontrol wizards define an create wizard that with existing Connect
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
@@ -627,7 +624,6 @@ snapshots["gsecontrol wizards define a wizard to select the control block refere
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="[next]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/ied.test.snap.js b/test/unit/wizards/__snapshots__/ied.test.snap.js
index bd871dae34..646f7f1ff7 100644
--- a/test/unit/wizards/__snapshots__/ied.test.snap.js
+++ b/test/unit/wizards/__snapshots__/ied.test.snap.js
@@ -34,7 +34,6 @@ snapshots["Wizards for SCL element IED edit existing IED looks like the latest s
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="edit"
     label="[save]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/optfields.test.snap.js b/test/unit/wizards/__snapshots__/optfields.test.snap.js
index 63a52c877a..64b51980e5 100644
--- a/test/unit/wizards/__snapshots__/optfields.test.snap.js
+++ b/test/unit/wizards/__snapshots__/optfields.test.snap.js
@@ -65,7 +65,6 @@ snapshots["Wizards for SCL OptFields element define an edit wizard that looks li
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/powertransformer.test.snap.js b/test/unit/wizards/__snapshots__/powertransformer.test.snap.js
index 08ed53b59f..498e02cba3 100644
--- a/test/unit/wizards/__snapshots__/powertransformer.test.snap.js
+++ b/test/unit/wizards/__snapshots__/powertransformer.test.snap.js
@@ -38,7 +38,6 @@ snapshots["Wizards for SCL element Power Transformer edit existing Power Transfo
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="edit"
     label="[save]"
     slot="primaryAction"
@@ -86,7 +85,6 @@ snapshots["Wizards for SCL element Power Transformer add new Power Transformer l
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="[add]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/reportcontrol.test.snap.js b/test/unit/wizards/__snapshots__/reportcontrol.test.snap.js
index 7d4ed784db..73cfdb6338 100644
--- a/test/unit/wizards/__snapshots__/reportcontrol.test.snap.js
+++ b/test/unit/wizards/__snapshots__/reportcontrol.test.snap.js
@@ -161,7 +161,6 @@ snapshots["Wizards for SCL ReportControl element define an edit wizard that for
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
@@ -291,7 +290,6 @@ snapshots["Wizards for SCL ReportControl element define an edit wizard that for
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
@@ -404,7 +402,6 @@ snapshots["Wizards for SCL ReportControl element define a select wizard that wit
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="add"
     label="[Report]"
     slot="primaryAction"
@@ -695,7 +692,6 @@ snapshots["Wizards for SCL ReportControl element define an create wizard that th
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
@@ -724,7 +720,6 @@ snapshots["Wizards for SCL ReportControl element define a wizard to select the c
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon=""
     label="[next]"
     slot="primaryAction"
@@ -848,7 +843,6 @@ snapshots["Wizards for SCL ReportControl element define copy to other IED select
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/sampledvaluecontrol.test.snap.js b/test/unit/wizards/__snapshots__/sampledvaluecontrol.test.snap.js
index 20ea3fd9f7..6d77be1996 100644
--- a/test/unit/wizards/__snapshots__/sampledvaluecontrol.test.snap.js
+++ b/test/unit/wizards/__snapshots__/sampledvaluecontrol.test.snap.js
@@ -186,7 +186,6 @@ snapshots["Wizards for SCL element SampledValueControl define an edit wizard tha
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/smv.test.snap.js b/test/unit/wizards/__snapshots__/smv.test.snap.js
index 4d6ce8cda8..c5c396767c 100644
--- a/test/unit/wizards/__snapshots__/smv.test.snap.js
+++ b/test/unit/wizards/__snapshots__/smv.test.snap.js
@@ -47,7 +47,6 @@ snapshots["Wizards for SCL element SMV include an edit wizard that looks like th
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="edit"
     label="[save]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/smvopts.test.snap.js b/test/unit/wizards/__snapshots__/smvopts.test.snap.js
index 1cd6742471..c44f9e75f8 100644
--- a/test/unit/wizards/__snapshots__/smvopts.test.snap.js
+++ b/test/unit/wizards/__snapshots__/smvopts.test.snap.js
@@ -47,7 +47,6 @@ snapshots["Wizards for SCL SmvOpts element define an edit wizard that looks like
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/subnetwork.test.snap.js b/test/unit/wizards/__snapshots__/subnetwork.test.snap.js
index f7eb1dab57..ba4cd486c6 100644
--- a/test/unit/wizards/__snapshots__/subnetwork.test.snap.js
+++ b/test/unit/wizards/__snapshots__/subnetwork.test.snap.js
@@ -49,7 +49,6 @@ snapshots["Wizards for SCL element SubNetwork include an edit wizard that with e
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
@@ -109,7 +108,6 @@ snapshots["Wizards for SCL element SubNetwork include an edit wizard that with m
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"
@@ -167,7 +165,6 @@ snapshots["Wizards for SCL element SubNetwork include an create wizard that look
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="add"
     label="[add]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/substation.test.snap.js b/test/unit/wizards/__snapshots__/substation.test.snap.js
index 2611701e84..db7733fb7f 100644
--- a/test/unit/wizards/__snapshots__/substation.test.snap.js
+++ b/test/unit/wizards/__snapshots__/substation.test.snap.js
@@ -31,7 +31,6 @@ snapshots["Wizards for SCL element Substation edit existing Substation looks lik
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="edit"
     label="[save]"
     slot="primaryAction"
@@ -72,7 +71,6 @@ snapshots["Wizards for SCL element Substation add new Substation looks like the
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="add"
     label="[add]"
     slot="primaryAction"
diff --git a/test/unit/wizards/__snapshots__/trgops.test.snap.js b/test/unit/wizards/__snapshots__/trgops.test.snap.js
index d3a5db1ae7..8bc9d4b5c9 100644
--- a/test/unit/wizards/__snapshots__/trgops.test.snap.js
+++ b/test/unit/wizards/__snapshots__/trgops.test.snap.js
@@ -47,7 +47,6 @@ snapshots["Wizards for SCL TrgOps element define an edit wizard that looks like
   >
   </mwc-button>
   <mwc-button
-    dialoginitialfocus=""
     icon="save"
     label="[save]"
     slot="primaryAction"