8 files changed, 8 insertions, 8 deletions
diff --git a/modern/src/settings/CalendarsPage.js b/modern/src/settings/CalendarsPage.js
index e46fe8f1..2602f702 100644
--- a/modern/src/settings/CalendarsPage.js
+++ b/modern/src/settings/CalendarsPage.js
@@ -57,7 +57,7 @@ const CalendarsPage = () => {
                 <CollectionActions itemId={item.id} editPath="/settings/calendar" endpoint="calendars" setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
-          )) : (<TableShimmer columns={2} />)}
+          )) : (<TableShimmer columns={2} endAction />)}
         </TableBody>
       </Table>
       <CollectionFab editPath="/settings/calendar" />
diff --git a/modern/src/settings/CommandsPage.js b/modern/src/settings/CommandsPage.js
index 3963952b..b6c88587 100644
--- a/modern/src/settings/CommandsPage.js
+++ b/modern/src/settings/CommandsPage.js
@@ -63,7 +63,7 @@ const CommandsPage = () => {
                 <CollectionActions itemId={item.id} editPath="/settings/command" endpoint="commands" setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
-          )) : (<TableShimmer columns={4} />)}
+          )) : (<TableShimmer columns={4} endAction />)}
         </TableBody>
       </Table>
       <CollectionFab editPath="/settings/command" />
diff --git a/modern/src/settings/ComputedAttributesPage.js b/modern/src/settings/ComputedAttributesPage.js
index 952ea677..59b3adbd 100644
--- a/modern/src/settings/ComputedAttributesPage.js
+++ b/modern/src/settings/ComputedAttributesPage.js
@@ -67,7 +67,7 @@ const ComputedAttributesPage = () => {
                 </TableCell>
               )}
             </TableRow>
-          )) : (<TableShimmer columns={administrator ? 5 : 4} />)}
+          )) : (<TableShimmer columns={administrator ? 5 : 4} endAction={administrator} />)}
         </TableBody>
       </Table>
       <CollectionFab editPath="/settings/attribute" />
diff --git a/modern/src/settings/DriversPage.js b/modern/src/settings/DriversPage.js
index 7700f5cd..6ea97b31 100644
--- a/modern/src/settings/DriversPage.js
+++ b/modern/src/settings/DriversPage.js
@@ -59,7 +59,7 @@ const DriversPage = () => {
                 <CollectionActions itemId={item.id} editPath="/settings/driver" endpoint="drivers" setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
-          )) : (<TableShimmer columns={3} />)}
+          )) : (<TableShimmer columns={3} endAction />)}
         </TableBody>
       </Table>
       <CollectionFab editPath="/settings/driver" />
diff --git a/modern/src/settings/GroupsPage.js b/modern/src/settings/GroupsPage.js
index 50f441eb..21785174 100644
--- a/modern/src/settings/GroupsPage.js
+++ b/modern/src/settings/GroupsPage.js
@@ -57,7 +57,7 @@ const GroupsPage = () => {
                 <CollectionActions itemId={item.id} editPath="/settings/group" endpoint="groups" setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
-          )) : (<TableShimmer columns={2} />)}
+          )) : (<TableShimmer columns={2} endAction />)}
         </TableBody>
       </Table>
       <CollectionFab editPath="/settings/group" />
diff --git a/modern/src/settings/MaintenancesPage.js b/modern/src/settings/MaintenancesPage.js
index da77be7e..c82629e4 100644
--- a/modern/src/settings/MaintenancesPage.js
+++ b/modern/src/settings/MaintenancesPage.js
@@ -86,7 +86,7 @@ const MaintenacesPage = () => {
                 <CollectionActions itemId={item.id} editPath="/settings/maintenance" endpoint="maintenance" setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
-          )) : (<TableShimmer columns={5} />)}
+          )) : (<TableShimmer columns={5} endAction />)}
         </TableBody>
       </Table>
       <CollectionFab editPath="/settings/maintenance" />
diff --git a/modern/src/settings/NotificationsPage.js b/modern/src/settings/NotificationsPage.js
index 6e268507..3c9a9192 100644
--- a/modern/src/settings/NotificationsPage.js
+++ b/modern/src/settings/NotificationsPage.js
@@ -76,7 +76,7 @@ const NotificationsPage = () => {
                 <CollectionActions itemId={item.id} editPath="/settings/notification" endpoint="notifications" setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
-          )) : (<TableShimmer columns={5} />)}
+          )) : (<TableShimmer columns={5} endAction />)}
         </TableBody>
       </Table>
       <CollectionFab editPath="/settings/notification" />
diff --git a/modern/src/settings/UsersPage.js b/modern/src/settings/UsersPage.js
index cffee2f6..a274d569 100644
--- a/modern/src/settings/UsersPage.js
+++ b/modern/src/settings/UsersPage.js
@@ -64,7 +64,7 @@ const UsersPage = () => {
                 <CollectionActions itemId={item.id} editPath="/settings/user" endpoint="users" setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
-          )) : (<TableShimmer columns={5} />)}
+          )) : (<TableShimmer columns={5} endAction />)}
         </TableBody>
       </Table>
       <CollectionFab editPath="/settings/user" />