diff --git a/src/shared/components/GenericList/components.js b/src/shared/components/GenericList/components.js
index ee2710614e..4bad7d571d 100644
--- a/src/shared/components/GenericList/components.js
+++ b/src/shared/components/GenericList/components.js
@@ -45,6 +45,8 @@ export const HeaderRenderer = ({
           <TableColumn
             slot={`${slot}-${index}`}
             key={typeof h === 'object' ? index : h}
+            popinDisplay="Block"
+            demandPopin={h === 'Popin' ? true : false}
             minWidth={
               Array.isArray(noHideFields) && noHideFields.length !== 0
                 ? noHideFields.find(field => field === h)
@@ -135,7 +137,7 @@ const DefaultRowRenderer = ({
   );
 
   return (
-    <TableRow type="Active">
+    <TableRow type="Active" selected={isSelected}>
       {cells}
       {!!actions.length && actionsCell}
       {displayArrow && (
diff --git a/src/shared/components/ListActions/ListActions.js b/src/shared/components/ListActions/ListActions.js
index ba46752312..f635ceef42 100644
--- a/src/shared/components/ListActions/ListActions.js
+++ b/src/shared/components/ListActions/ListActions.js
@@ -22,7 +22,10 @@ const StandaloneAction = ({ action, entry }) => {
   return (
     <Button
       data-testid={action.name.replace(' ', '').toLowerCase()}
-      onClick={() => action.handler(entry)}
+      onClick={e => {
+        e.stopPropagation();
+        action.handler(entry);
+      }}
       className="list-actions__standalone"
       design="Transparent"
       icon={typeof icon === 'function' ? icon(entry) : icon}