diff --git a/app/client/src/WidgetProvider/factory/index.tsx b/app/client/src/WidgetProvider/factory/index.tsx
index 346a03e0a5..04facdf369 100644
--- a/app/client/src/WidgetProvider/factory/index.tsx
+++ b/app/client/src/WidgetProvider/factory/index.tsx
@@ -80,7 +80,7 @@ class WidgetFactory {
 
   private static configureWidget(widget: typeof BaseWidget) {
     const config = widget.getConfig();
-
+    const { IconCmp } = widget.getMethods();
     const features = widget.getFeatures();
 
     let enhancedFeatures: Record<string, unknown> = {};
@@ -103,7 +103,7 @@ class WidgetFactory {
       ...enhancedFeatures,
       searchTags: config.searchTags,
       tags: config.tags,
-      hideCard: !!config.hideCard || !config.iconSVG,
+      hideCard: !!config.hideCard || !(config.iconSVG || IconCmp),
       isDeprecated: !!config.isDeprecated,
       replacement: config.replacement,
       displayName: config.name,
diff --git a/app/client/src/selectors/editorSelectors.tsx b/app/client/src/selectors/editorSelectors.tsx
index bd894a0a50..ec497749cf 100644
--- a/app/client/src/selectors/editorSelectors.tsx
+++ b/app/client/src/selectors/editorSelectors.tsx
@@ -309,25 +309,20 @@ export const getWidgetCards = createSelector(
   getIsAnvilLayout,
   (isAutoLayout, isAnvilLayout) => {
     const widgetConfigs = WidgetFactory.getConfigs();
-
-    const cards = Object.values(widgetConfigs).filter((config) => {
-      // if anvil is not enabled, hide all wds widgets
-      if (
-        Object.values(WDS_V2_WIDGET_MAP).includes(config.type) &&
-        !isAnvilLayout
-      ) {
-        return false;
+    const widgetConfigsArray = Object.values(widgetConfigs);
+    const layoutSystemBasesWidgets = widgetConfigsArray.filter((config) => {
+      const isAnvilWidget = Object.values(WDS_V2_WIDGET_MAP).includes(
+        config.type,
+      );
+      if (isAnvilLayout) {
+        return isAnvilWidget;
       }
-
+      return !isAnvilWidget;
+    });
+    const cards = layoutSystemBasesWidgets.filter((config) => {
       if (isAirgapped()) {
         return config.widgetName !== "Map" && !config.hideCard;
       }
-
-      // if anvil is enabled, only show the wds widgets
-      if (isAnvilLayout) {
-        return Object.values(WDS_V2_WIDGET_MAP).includes(config.type);
-      }
-
       return !config.hideCard;
     });