diff --git a/ui/src/album/AlbumContextMenu.js b/ui/src/album/AlbumContextMenu.js
new file mode 100644
index 00000000..b0a42859
--- /dev/null
+++ b/ui/src/album/AlbumContextMenu.js
@@ -0,0 +1,77 @@
+import React, {useState} from 'react'
+import IconButton from '@material-ui/core/IconButton'
+import Menu from '@material-ui/core/Menu'
+import MenuItem from '@material-ui/core/MenuItem'
+import MoreVertIcon from '@material-ui/icons/MoreVert'
+import { useDataProvider, useTranslate } from 'react-admin';
+import { useDispatch } from 'react-redux'
+import { playAlbum, shuffleAlbum } from '../audioplayer'
+
+const AlbumContextMenu = (props) => {
+  const dataProvider = useDataProvider();	
+  const dispatch = useDispatch()
+  const translate = useTranslate()  
+  const [anchorEl, setAnchorEl] = useState(null)
+  const open = Boolean(anchorEl)
+  const options = {
+	  play: { 
+	    label: translate('resources.album.actions.playAll'),
+	    action: (data, id) => (playAlbum(id, data))
+	  },
+	  shuffle: {
+	    label: translate('resources.album.actions.shuffle'), 
+	    action: (data) => (shuffleAlbum(data))  
+	  },
+  }
+
+  const handleClick = (e) => {
+    e.preventDefault()
+    setAnchorEl(e.currentTarget)
+  }
+
+  const handleOnClose = (e) => {
+    e.preventDefault()
+    setAnchorEl(null)
+  }
+
+  const handleItemClick = (e) => {
+    e.preventDefault()
+    setAnchorEl(null)
+	const key = e.target.getAttribute('value') 
+	  dataProvider.getList('albumSong', {
+          pagination: { page: 0, perPage: 1000 },
+          sort: { field: 'trackNumber', order: 'ASC' },
+          filter: { album_id: props.id },
+        }).then((response) => {
+		    const adata	= (response.data).reduce((acc, cur) => ({ ...acc, [cur.id]: cur }), {})
+			dispatch(options[key].action(adata, response.data[0].id))
+      	})
+  }
+
+  return (
+    <div>
+      <IconButton
+        aria-label="more"
+        aria-controls="context-menu"
+        aria-haspopup="true"
+        onClick={handleClick}
+      >
+        <MoreVertIcon />
+      </IconButton>
+      <Menu
+        id="context-menu"
+        anchorEl={anchorEl}
+        keepMounted
+        open={open}
+		onClose={handleOnClose}
+      >
+        {Object.keys(options).map((key) => (
+          <MenuItem value={key} key={key} onClick={handleItemClick}>
+            {options[key].label}
+          </MenuItem>
+        ))}
+      </Menu>
+    </div>
+  )
+}
+export default AlbumContextMenu
diff --git a/ui/src/album/GridMenu.js b/ui/src/album/GridMenu.js
deleted file mode 100644
index 4940562c..00000000
--- a/ui/src/album/GridMenu.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import React from 'react'
-import IconButton from '@material-ui/core/IconButton'
-import Menu from '@material-ui/core/Menu'
-import MenuItem from '@material-ui/core/MenuItem'
-import MoreVertIcon from '@material-ui/icons/MoreVert'
-import { useDispatch } from 'react-redux'
-import { playAlbum, shuffleAlbum } from '../audioplayer'
-import { useGetList } from 'react-admin'
-
-const GridMenu = (props) => {
-  const [anchorEl, setAnchorEl] = React.useState(null)
-  const dispatch = useDispatch()
-  const { ids, data, loading, error } = useGetList(
-    'albumSong',
-    {},
-    { field: 'trackNumber', order: 'ASC' },
-    { album_id: props.id }
-  )
-
-  if (loading) {
-    return (
-      <IconButton>
-        <MoreVertIcon />
-      </IconButton>
-    )
-  }
-
-  if (error) {
-    return (
-      <IconButton>
-        <MoreVertIcon />
-      </IconButton>
-    )
-  }
-
-  const options = [
-    [1, 'Play'],
-    [2, 'Shuffle'],
-  ]
-
-  const open = Boolean(anchorEl)
-
-  const handleClick = (e) => {
-    e.preventDefault()
-    setAnchorEl(e.currentTarget)
-  }
-
-  const handleClose = (e) => {
-    e.preventDefault()
-    setAnchorEl(null)
-  }
-
-  const handleItemClick = (e) => {
-    e.preventDefault()
-    setAnchorEl(null)
-    const value = e.target.getAttribute('value')
-    if (value === '1') {
-      dispatch(playAlbum(ids[0], data))
-    }
-    if (value === '2') {
-      dispatch(shuffleAlbum(data))
-    }
-  }
-
-  return (
-    <div>
-      <IconButton
-        aria-label="more"
-        aria-controls="long-menu"
-        aria-haspopup="true"
-        onClick={handleClick}
-      >
-        <MoreVertIcon />
-      </IconButton>
-      <Menu
-        id="long-menu"
-        anchorEl={anchorEl}
-        keepMounted
-        open={open}
-        onClose={handleClose}
-      >
-        {options.map((option) => (
-          <MenuItem value={option[0]} key={option[0]} onClick={handleItemClick}>
-            {option[1]}
-          </MenuItem>
-        ))}
-      </Menu>
-    </div>
-  )
-}
-export default GridMenu