diff --git a/frontend/public/components/_dropdown.scss b/frontend/public/components/_dropdown.scss
index 55c1f7555e7..dbcf6369354 100644
--- a/frontend/public/components/_dropdown.scss
+++ b/frontend/public/components/_dropdown.scss
@@ -209,10 +209,6 @@ $dropdown-background--hover: $color-pf-black-200; // pf-c-dropdown__menu-item--h
   }
 }
 
-.co-storage-class-dropdown .pf-c-dropdown__menu {
-  min-width: 290px;
-}
-
 .dropdown-menu__autocomplete-filter {
   max-height: 60vh;
   overflow-x: hidden;
diff --git a/frontend/public/components/_resource.scss b/frontend/public/components/_resource.scss
index 231d54d11bf..5d77d738841 100644
--- a/frontend/public/components/_resource.scss
+++ b/frontend/public/components/_resource.scss
@@ -10,6 +10,7 @@
   min-width: 18px;
   padding: 1px 4px;
   text-align: center;
+  white-space: nowrap;
   &--lg {
     font-size: ($font-size-base + 3);
     line-height: 20px;
diff --git a/frontend/public/components/utils/storage-class-dropdown.tsx b/frontend/public/components/utils/storage-class-dropdown.tsx
index 164849cd345..514f0640847 100644
--- a/frontend/public/components/utils/storage-class-dropdown.tsx
+++ b/frontend/public/components/utils/storage-class-dropdown.tsx
@@ -149,6 +149,7 @@ export class StorageClassDropdownInner extends React.Component<
             </label>
             <Dropdown
               className="co-storage-class-dropdown"
+              dropDownClassName="dropdown--full-width"
               autocompleteFilter={this.autocompleteFilter}
               autocompletePlaceholder="Select storage class"
               items={items}
@@ -189,28 +190,21 @@ const StorageClassDropdownEntry = (props) => {
   ];
   const storageClassDescriptionLine = _.compact(storageClassProperties).join(' | ');
   return (
-    <div className="form__storage-class-dropdown__flex-column">
-      <div className="form__storage-class-dropdown__flex-row">
-        <span className="form__storage-class-dropdown__icon-column">
-          <ResourceIcon kind={props.kindLabel} />
-        </span>{' '}
-        <span>{props.name}</span>
-      </div>
-      <div className="form__storage-class-dropdown__flex-row">
-        <div className="form__storage-class-dropdown__icon-column"> &nbsp;</div>
-        <div className="text-muted"> {storageClassDescriptionLine}</div>
-      </div>
-    </div>
+    <span className="co-resource-item">
+      <ResourceIcon kind={props.kindLabel} />
+      <span className="co-resource-item__resource-name">
+        {props.name}
+        <div className="text-muted small"> {storageClassDescriptionLine}</div>
+      </span>
+    </span>
   );
 };
 
 const StorageClassDropdownNoStorageClassOption = (props) => {
   return (
-    <div className="form__storage-class-dropdown__flex-column">
-      <div className="form__storage-class-dropdown__flex-row">
-        <span className="form__storage-class-dropdown__icon-column" /> <span>{props.name}</span>
-      </div>
-    </div>
+    <span className="co-resource-item">
+      <span className="co-resource-item__resource-name">{props.name}</span>
+    </span>
   );
 };
 
diff --git a/frontend/public/style/_forms.scss b/frontend/public/style/_forms.scss
index e3f6d6c9cc6..7b498a5eb2f 100644
--- a/frontend/public/style/_forms.scss
+++ b/frontend/public/style/_forms.scss
@@ -59,20 +59,6 @@
   top: 1px;
 }
 
-.form__storage-class-dropdown__flex-column {
-  display: flex;
-  flex-direction: column;
-}
-
-.form__storage-class-dropdown__flex-row {
-  display: flex;
-}
-
-.form__storage-class-dropdown__icon-column {
-  flex-basis: 30px;
-  max-width: 30px;
-}
-
 .has-feedback .pf-c-form-control {
   padding-right: 25px;
 }