diff --git a/packages/main/__karma_snapshots__/DayPicker.md b/packages/main/__karma_snapshots__/DayPicker.md
index e14c9b2123a..e1ba848919e 100644
--- a/packages/main/__karma_snapshots__/DayPicker.md
+++ b/packages/main/__karma_snapshots__/DayPicker.md
@@ -4,7 +4,7 @@
 
 ```
 <ThemeProvider withToastContainer={false}>
-  <JssProvider generateId={[Function]} id={{...}}>
+  <JssProvider generateId={[Function]}>
     <ThemeProvider theme={{...}}>
       <DayPicker>
         <ui5-daypicker class="" />
diff --git a/packages/main/__karma_snapshots__/FilterBar.md b/packages/main/__karma_snapshots__/FilterBar.md
index 760484e00b6..674b489a969 100644
--- a/packages/main/__karma_snapshots__/FilterBar.md
+++ b/packages/main/__karma_snapshots__/FilterBar.md
@@ -10,7 +10,7 @@
         <FilterBar renderSearch={[Function: renderSearch]} renderVariants={[Function: renderVariants]} displayOnly={true} innerRef={{...}} classes={{...}} theme={{...}}>
           <div className="FilterBar-outerContainer---">
             <div className="FilterBar-filterBarHeader---">
-              <Variant Management variantItems={{...}} enabled={true} popupTitle="Variants" initialSelectedKey={{...}} onSelect={[Function: onSelect]} closeOnItemSelect={true} placement="Bottom" level="H4" disabled={false}>
+              <Variant Management variantItems={{...}} popupTitle="Variants" initialSelectedKey={{...}} onSelect={[Function: onSelect]} closeOnItemSelect={true} placement="Bottom" level="H4" disabled={false}>
                 <Popover open={false} onAfterOpen={[Function]} headerText="Variants" placementType="Bottom" openBy={{...}} footer={{...}} className={[undefined]} innerStyles={[undefined]} tooltip={[undefined]} initialFocus={{...}} horizontalAlign="Center" verticalAlign="Center">
                   <div style={{...}} onClick={[Function]}>
                     <div className="Variant-Management--VariantManagement---">
@@ -125,7 +125,7 @@
         <FilterBar renderVariants={[Function: renderVariants]} displayOnly={true} innerRef={{...}} classes={{...}} theme={{...}}>
           <div className="FilterBar-outerContainer---">
             <div className="FilterBar-filterBarHeader---">
-              <Variant Management variantItems={{...}} enabled={true} popupTitle="Variants" initialSelectedKey={{...}} onSelect={[Function: onSelect]} closeOnItemSelect={true} placement="Bottom" level="H4" disabled={false}>
+              <Variant Management variantItems={{...}} popupTitle="Variants" initialSelectedKey={{...}} onSelect={[Function: onSelect]} closeOnItemSelect={true} placement="Bottom" level="H4" disabled={false}>
                 <Popover open={false} onAfterOpen={[Function]} headerText="Variants" placementType="Bottom" openBy={{...}} footer={{...}} className={[undefined]} innerStyles={[undefined]} tooltip={[undefined]} initialFocus={{...}} horizontalAlign="Center" verticalAlign="Center">
                   <div style={{...}} onClick={[Function]}>
                     <div className="Variant-Management--VariantManagement---">
@@ -249,7 +249,7 @@
         <FilterBar renderVariants={[Function: renderVariants]} displayOnly={true} innerRef={{...}} classes={{...}} theme={{...}}>
           <div className="FilterBar-outerContainer---">
             <div className="FilterBar-filterBarHeader---">
-              <Variant Management variantItems={{...}} enabled={true} popupTitle="Variants" initialSelectedKey={{...}} onSelect={[Function: onSelect]} closeOnItemSelect={true} placement="Bottom" level="H4" disabled={false}>
+              <Variant Management variantItems={{...}} popupTitle="Variants" initialSelectedKey={{...}} onSelect={[Function: onSelect]} closeOnItemSelect={true} placement="Bottom" level="H4" disabled={false}>
                 <Popover open={false} onAfterOpen={[Function]} headerText="Variants" placementType="Bottom" openBy={{...}} footer={{...}} className={[undefined]} innerStyles={[undefined]} tooltip={[undefined]} initialFocus={{...}} horizontalAlign="Center" verticalAlign="Center">
                   <div style={{...}} onClick={[Function]}>
                     <div className="Variant-Management--VariantManagement---">
diff --git a/packages/main/__karma_snapshots__/VariantManagement.md b/packages/main/__karma_snapshots__/VariantManagement.md
index 8011a2b8827..b05101ffe6c 100644
--- a/packages/main/__karma_snapshots__/VariantManagement.md
+++ b/packages/main/__karma_snapshots__/VariantManagement.md
@@ -6,7 +6,7 @@
 <ThemeProvider withToastContainer={false}>
   <JssProvider generateId={[Function]}>
     <ThemeProvider theme={{...}}>
-      <Variant Management variantItems={{...}} enabled={true} popupTitle="Variants" initialSelectedKey={{...}} onSelect={[Function: onSelect]} closeOnItemSelect={true} placement="Bottom" level="H4" disabled={false}>
+      <Variant Management variantItems={{...}} popupTitle="Variants" initialSelectedKey={{...}} onSelect={[Function: onSelect]} closeOnItemSelect={true} placement="Bottom" level="H4" disabled={false}>
         <Popover open={false} onAfterOpen={[Function]} headerText="Variants" placementType="Bottom" openBy={{...}} footer={{...}} className={[undefined]} innerStyles={[undefined]} tooltip={[undefined]} initialFocus={{...}} horizontalAlign="Center" verticalAlign="Center">
           <div style={{...}} onClick={[Function]}>
             <div className="Variant-Management--VariantManagement---">
@@ -29,8 +29,8 @@
               </Button>
               <WithWebComponent(List) onItemClick={[Function]} mode="SingleSelect" headerText="" footerText="" noDataText="" separators="All">
                 <ui5-list mode="SingleSelect" header-text="" footer-text="" no-data-text="" separators="All" class="">
-                  <StandardListItem style={{...}} data-key="1" type="Active" selected={false} infoState="None">
-                    <ui5-li style={{...}} data-key="1" type="Active" info-state="None" class="">
+                  <StandardListItem style={{...}} data-key="1" type="Active" selected={true} infoState="None">
+                    <ui5-li selected={true} style={{...}} data-key="1" type="Active" info-state="None" class="">
                       Variant 1
                     </ui5-li>
                   </StandardListItem>
diff --git a/packages/main/src/components/VariantManagement/index.tsx b/packages/main/src/components/VariantManagement/index.tsx
index 673042ac217..5e4652caeea 100644
--- a/packages/main/src/components/VariantManagement/index.tsx
+++ b/packages/main/src/components/VariantManagement/index.tsx
@@ -20,7 +20,6 @@ export interface VariantItem {
 }
 
 export interface VariantManagementPropTypes extends CommonProps {
-  enabled?: boolean;
   placement?: PlacementType;
   popupTitle?: string;
   initialSelectedKey?: string;
@@ -185,7 +184,6 @@ const VariantManagement: FC<VariantManagementPropTypes> = forwardRef(
 );
 
 VariantManagement.defaultProps = {
-  enabled: true,
   popupTitle: 'Variants',
   initialSelectedKey: null,
   onSelect: () => {},