diff --git a/ui/src/album/AlbumSongs.js b/ui/src/album/AlbumSongs.js
index 044fdeb5b8b..f8556e50cc2 100644
--- a/ui/src/album/AlbumSongs.js
+++ b/ui/src/album/AlbumSongs.js
@@ -131,7 +131,7 @@ const AlbumSongs = (props) => {
               {...controllerProps}
               hasBulkActions={hasBulkActions}
               multiDisc={multiDisc}
-              contextVisible={isXsmall}
+              contextAlwaysVisible={isXsmall}
             >
               {isDesktop && (
                 <TextField
diff --git a/ui/src/common/SongDatagrid.js b/ui/src/common/SongDatagrid.js
index 6d4176a0635..b24d03f401c 100644
--- a/ui/src/common/SongDatagrid.js
+++ b/ui/src/common/SongDatagrid.js
@@ -22,7 +22,8 @@ export const SongDatagridRow = ({
   record,
   children,
   multiDisc,
-  contextVisible,
+  contextAlwaysVisible,
+  contextMenu,
   ...rest
 }) => {
   const classes = useStyles()
@@ -57,7 +58,7 @@ export const SongDatagridRow = ({
             (index < childCount - 1
               ? child
               : cloneElement(child, {
-                  visible: contextVisible || visible,
+                  visible: contextAlwaysVisible || visible,
                   ...rest,
                 }))
         )}
@@ -70,17 +71,17 @@ SongDatagridRow.propTypes = {
   record: PropTypes.object,
   children: PropTypes.node,
   multiDisc: PropTypes.bool,
-  contextVisible: PropTypes.bool,
+  contextAlwaysVisible: PropTypes.bool,
 }
 
-export const SongDatagrid = ({ multiDisc, contextVisible, ...rest }) => {
+export const SongDatagrid = ({ multiDisc, contextAlwaysVisible, ...rest }) => {
   const SongDatagridBody = (props) => (
     <DatagridBody
       {...props}
       row={
         <SongDatagridRow
           multiDisc={multiDisc}
-          contextVisible={contextVisible}
+          contextAlwaysVisible={contextAlwaysVisible}
         />
       }
     />
@@ -89,6 +90,6 @@ export const SongDatagrid = ({ multiDisc, contextVisible, ...rest }) => {
 }
 
 SongDatagrid.propTypes = {
-  contextVisible: PropTypes.bool,
+  contextAlwaysVisible: PropTypes.bool,
   multiDisc: PropTypes.bool,
 }
diff --git a/ui/src/playlist/PlaylistSongs.js b/ui/src/playlist/PlaylistSongs.js
index f321b70cb93..d10f1270697 100644
--- a/ui/src/playlist/PlaylistSongs.js
+++ b/ui/src/playlist/PlaylistSongs.js
@@ -115,7 +115,7 @@ const PlaylistSongs = (props) => {
               rowClick={null}
               {...controllerProps}
               hasBulkActions={hasBulkActions}
-              contextVisible={isXsmall}
+              contextAlwaysVisible={isXsmall}
             >
               {isDesktop && <TextField source="id" label={'#'} />}
               <TextField source="title" />