diff --git a/jam-ui/src/components/popups/JKPopupMediaControls.js b/jam-ui/src/components/popups/JKPopupMediaControls.js
index 3f0fe2a24..0290732af 100644
--- a/jam-ui/src/components/popups/JKPopupMediaControls.js
+++ b/jam-ui/src/components/popups/JKPopupMediaControls.js
@@ -13,7 +13,7 @@ import {
   selectJamTracks,
   selectRecordedTracks,
   selectJamTrackState,
-  selectDownloadingJamTrack
+  selectDownloadState
 } from '../../store/features/mediaSlice';
 import {
   selectShowMyMixes,
@@ -34,13 +34,16 @@ const JKPopupMediaControls = ({ onClose }) => {
   const recordedTracks = useSelector(selectRecordedTracks);
   const metronome = useSelector(selectMetronome);
   const jamTrackState = useSelector(selectJamTrackState);
-  const downloadingJamTrack = useSelector(selectDownloadingJamTrack);
+  const downloadState = useSelector(selectDownloadState);
   const showMyMixes = useSelector(selectShowMyMixes);
   const showCustomMixes = useSelector(selectShowCustomMixes);
   const editingMixdownId = useSelector(selectEditingMixdownId);
   const creatingMixdown = useSelector(selectCreatingMixdown);
   const createMixdownErrors = useSelector(selectCreateMixdownErrors);
 
+  // Compute if JamTrack is currently downloading
+  const downloadingJamTrack = downloadState.state === 'downloading' || downloadState.state === 'checking' || downloadState.state === 'keying';
+
   // Redux actions
   const {
     closeMedia,