diff --git a/ui/src/album/AlbumSongs.js b/ui/src/album/AlbumSongs.js
index f8556e50c..27ba154ea 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}
-              contextAlwaysVisible={isXsmall}
+              contextAlwaysVisible={!isDesktop}
             >
               {isDesktop && (
                 <TextField
diff --git a/ui/src/song/SongList.js b/ui/src/song/SongList.js
index 5ee6dccac..133170e84 100644
--- a/ui/src/song/SongList.js
+++ b/ui/src/song/SongList.js
@@ -76,6 +76,7 @@ const SongList = (props) => {
           <SongDatagrid
             expand={<SongDetails />}
             rowClick={(id, basePath, record) => dispatch(setTrack(record))}
+            contextAlwaysVisible={!isDesktop}
           >
             <TextField source="title" />
             {isDesktop && <AlbumLinkField source="album" />}
@@ -86,20 +87,16 @@ const SongList = (props) => {
               <FunctionField source="year" render={(r) => r.year || ''} />
             )}
             <DurationField source="duration" />
-            {isDesktop ? (
-              <SongContextMenu
-                source={'starred'}
-                label={
-                  <StarBorderIcon
-                    fontSize={'small'}
-                    className={classes.columnIcon}
-                  />
-                }
-                sortBy={'starred DESC, starredAt DESC'}
-              />
-            ) : (
-              <SongContextMenu showStar={false} />
-            )}
+            <SongContextMenu
+              source={'starred'}
+              sortBy={'starred DESC, starredAt DESC'}
+              label={
+                <StarBorderIcon
+                  fontSize={'small'}
+                  className={classes.columnIcon}
+                />
+              }
+            />
           </SongDatagrid>
         )}
       </List>