diff --git a/src/shared/components/GenericList/GenericList.js b/src/shared/components/GenericList/GenericList.js
index 62900ae352..862b2f9e5d 100644
--- a/src/shared/components/GenericList/GenericList.js
+++ b/src/shared/components/GenericList/GenericList.js
@@ -383,7 +383,9 @@ export const GenericList = ({
       style={disableMargin ? {} : spacing.sapUiSmallMargin}
     >
       <Table
-        className={`ui5-generic-list ${hasDetailsView ? 'cursor-pointer' : ''}`}
+        className={`ui5-generic-list ${
+          hasDetailsView && filteredEntries.length ? 'cursor-pointer' : ''
+        }`}
         onRowClick={e => {
           if (!hasDetailsView) return;
           handleActionIfFormOpen(
diff --git a/src/shared/components/GenericList/GenericList.scss b/src/shared/components/GenericList/GenericList.scss
index 43e5c4c114..ed5f944f6d 100644
--- a/src/shared/components/GenericList/GenericList.scss
+++ b/src/shared/components/GenericList/GenericList.scss
@@ -7,3 +7,7 @@
     color: var(--sapList_TextColor);
   }
 }
+
+.cursor-pointer {
+  cursor: pointer;
+}