diff --git a/ui/src/audioplayer/PlayerToolbar.js b/ui/src/audioplayer/PlayerToolbar.js
index 00925918..5cc381d4 100644
--- a/ui/src/audioplayer/PlayerToolbar.js
+++ b/ui/src/audioplayer/PlayerToolbar.js
@@ -1,26 +1,33 @@
 import React from 'react'
 import { useLocation } from 'react-router-dom'
 import { useGetOne } from 'react-admin'
-import IconButton from '@material-ui/core/IconButton'
-import StarBorderIcon from '@material-ui/icons/StarBorder'
-import { StarButton } from '../common'
+import { StarButton, useToggleStar } from '../common'
+import { useHotkeys } from 'react-hotkeys-hook'
 
-const Placeholder = () => (
-  <IconButton>
-    <StarBorderIcon disabled={true} />
-  </IconButton>
-)
+const Placeholder = () => <StarButton disabled={true} />
 
 const Toolbar = ({ id }) => {
   const location = useLocation()
   const resource = location.pathname.startsWith('/song') ? 'song' : 'albumSong'
   const { data, loading } = useGetOne(resource, id)
+  const [toggleStar, toggling] = useToggleStar(resource, data)
 
-  if (loading) {
-    return <Placeholder />
-  }
+  useHotkeys(
+    's',
+    () => {
+      toggleStar()
+    },
+    {},
+    [toggleStar]
+  )
 
-  return <StarButton record={data} resource={resource} />
+  return (
+    <StarButton
+      record={data}
+      resource={resource}
+      disabled={loading || toggling}
+    />
+  )
 }
 
 const PlayerToolbar = ({ id }) => (id ? <Toolbar id={id} /> : <Placeholder />)
diff --git a/ui/src/common/StarButton.js b/ui/src/common/StarButton.js
index bf68655c..add4d6bb 100644
--- a/ui/src/common/StarButton.js
+++ b/ui/src/common/StarButton.js
@@ -1,11 +1,10 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react'
+import React, { useCallback } from 'react'
 import PropTypes from 'prop-types'
-import { useNotify, useDataProvider } from 'react-admin'
 import StarIcon from '@material-ui/icons/Star'
 import StarBorderIcon from '@material-ui/icons/StarBorder'
 import IconButton from '@material-ui/core/IconButton'
 import { makeStyles } from '@material-ui/core/styles'
-import subsonic from '../subsonic'
+import { useToggleStar } from './useToggleStar'
 
 const useStyles = makeStyles({
   star: {
@@ -27,52 +26,26 @@ export const StarButton = ({
   size,
   component: Button,
   addLabel,
+  disabled,
   ...rest
 }) => {
-  const [loading, setLoading] = useState(false)
   const classes = useStyles({ color, visible, starred: record.starred })
-  const notify = useNotify()
+  const [toggleStar, loading] = useToggleStar(resource, record)
 
-  const mountedRef = useRef(false)
-  useEffect(() => {
-    mountedRef.current = true
-    return () => {
-      mountedRef.current = false
-    }
-  }, [])
-
-  const dataProvider = useDataProvider()
-
-  const refreshRecord = useCallback(() => {
-    dataProvider.getOne(resource, { id: record.id }).then(() => {
-      if (mountedRef.current) {
-        setLoading(false)
-      }
-    })
-  }, [dataProvider, record.id, resource])
-
-  const handleToggleStar = (e) => {
-    e.preventDefault()
-    const toggleStar = record.starred ? subsonic.unstar : subsonic.star
-
-    setLoading(true)
-    toggleStar(record.id)
-      .then(refreshRecord)
-      .catch((e) => {
-        console.log('Error toggling star: ', e)
-        notify('ra.page.error', 'warning')
-        if (mountedRef.current) {
-          setLoading(false)
-        }
-      })
-    e.stopPropagation()
-  }
+  const handleToggleStar = useCallback(
+    (e) => {
+      e.preventDefault()
+      toggleStar()
+      e.stopPropagation()
+    },
+    [toggleStar]
+  )
 
   return (
     <Button
       onClick={handleToggleStar}
       size={'small'}
-      disabled={loading}
+      disabled={disabled || loading}
       className={classes.star}
       {...rest}
     >
@@ -92,6 +65,7 @@ StarButton.propTypes = {
   color: PropTypes.string,
   size: PropTypes.string,
   component: PropTypes.object,
+  disabled: PropTypes.bool,
 }
 
 StarButton.defaultProps = {
@@ -101,4 +75,5 @@ StarButton.defaultProps = {
   size: 'small',
   color: 'inherit',
   component: IconButton,
+  disabled: false,
 }
diff --git a/ui/src/common/index.js b/ui/src/common/index.js
index f6b4d442..e0ea874c 100644
--- a/ui/src/common/index.js
+++ b/ui/src/common/index.js
@@ -23,5 +23,6 @@ export * from './Title'
 export * from './SongBulkActions'
 export * from './useAlbumsPerPage'
 export * from './useInterval'
+export * from './useToggleStar'
 export * from './useTraceUpdate'
 export * from './Writable'
diff --git a/ui/src/common/useToggleStar.js b/ui/src/common/useToggleStar.js
new file mode 100644
index 00000000..fbf608a7
--- /dev/null
+++ b/ui/src/common/useToggleStar.js
@@ -0,0 +1,43 @@
+import { useCallback, useEffect, useRef, useState } from 'react'
+import { useDataProvider, useNotify } from 'react-admin'
+import subsonic from '../subsonic'
+
+export const useToggleStar = (resource, record) => {
+  const [loading, setLoading] = useState(false)
+  const notify = useNotify()
+
+  const mountedRef = useRef(false)
+  useEffect(() => {
+    mountedRef.current = true
+    return () => {
+      mountedRef.current = false
+    }
+  }, [])
+
+  const dataProvider = useDataProvider()
+
+  const refreshRecord = useCallback(() => {
+    dataProvider.getOne(resource, { id: record.id }).then(() => {
+      if (mountedRef.current) {
+        setLoading(false)
+      }
+    })
+  }, [dataProvider, record.id, resource])
+
+  const toggleStar = () => {
+    const toggle = record.starred ? subsonic.unstar : subsonic.star
+
+    setLoading(true)
+    toggle(record.id)
+      .then(refreshRecord)
+      .catch((e) => {
+        console.log('Error toggling star: ', e)
+        notify('ra.page.error', 'warning')
+        if (mountedRef.current) {
+          setLoading(false)
+        }
+      })
+  }
+
+  return [toggleStar, loading]
+}