diff --git a/persistence/album_repository.go b/persistence/album_repository.go
index ac3df791..d930d144 100644
--- a/persistence/album_repository.go
+++ b/persistence/album_repository.go
@@ -319,14 +319,14 @@ func (r albumRepository) Delete(id string) error {
 }
 
 func (r albumRepository) Save(entity interface{}) (string, error) {
-	mf := entity.(*model.Artist)
-	id, err := r.put(mf.ID, mf)
+	album := entity.(*model.Album)
+	id, err := r.put(album.ID, album)
 	return id, err
 }
 
 func (r albumRepository) Update(entity interface{}, cols ...string) error {
-	mf := entity.(*model.Artist)
-	_, err := r.put(mf.ID, mf)
+	album := entity.(*model.Album)
+	_, err := r.put(album.ID, album)
 	return err
 }
 
diff --git a/ui/src/common/ContextMenus.js b/ui/src/common/ContextMenus.js
index 710f0441..a609ce69 100644
--- a/ui/src/common/ContextMenus.js
+++ b/ui/src/common/ContextMenus.js
@@ -136,6 +136,7 @@ const ContextMenu = ({
   )
 
   const handleToggleStar = (e) => {
+    e.preventDefault()
     toggleStarred()
     e.stopPropagation()
   }
@@ -188,6 +189,7 @@ const ContextMenu = ({
 export const AlbumContextMenu = (props) => (
   <ContextMenu
     {...props}
+    resource={'album'}
     songQueryParams={{
       pagination: { page: 1, perPage: -1 },
       sort: { field: 'discNumber, trackNumber', order: 'ASC' },
@@ -213,6 +215,7 @@ AlbumContextMenu.defaultProps = {
 export const ArtistContextMenu = (props) => (
   <ContextMenu
     {...props}
+    resource={'artist'}
     songQueryParams={{
       pagination: { page: 1, perPage: 200 },
       sort: { field: 'album, discNumber, trackNumber', order: 'ASC' },