diff --git a/packages/app/app/components/HelpModal/styles.scss b/packages/app/app/components/HelpModal/styles.scss
index 9656c7eb0d..080f278dbd 100644
--- a/packages/app/app/components/HelpModal/styles.scss
+++ b/packages/app/app/components/HelpModal/styles.scss
@@ -2,6 +2,10 @@
 
 $icon_color: rgba($white, 0.75) !important;
 
+.ui.page.modals.dimmer {
+  background: rgba($background, 0.85);
+}
+
 .help_modal {
   top: 25% !important;
   color: $icon_color;
diff --git a/packages/app/app/components/PlayQueue/QueuePopup/index.js b/packages/app/app/components/PlayQueue/QueuePopup/index.js
index 6d559c6a22..d927642b60 100644
--- a/packages/app/app/components/PlayQueue/QueuePopup/index.js
+++ b/packages/app/app/components/PlayQueue/QueuePopup/index.js
@@ -1,7 +1,7 @@
 import React, { useRef, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import cs from 'classnames';
-import { withState, withHandlers, compose } from 'recompose';
+import { withState, withHandlers, withProps, compose } from 'recompose';
 import { Popup } from 'semantic-ui-react';
 import { StreamInfo } from '@nuclear/ui';
 
@@ -21,16 +21,11 @@ export const QueuePopup = ({
   track,
   index,
   actions,
-  plugins
+  plugins,
+  selectedStream
 }) => {
   const triggerElement = useRef(null);
 
-  const getSelectedStreamForQueueItem = track => {
-    _.find(track.streams, { source: plugins.selected.streamProviders });
-  };
-
-  const selectedStream = getSelectedStreamForQueueItem(track);
-
   const handleOpen = useCallback(
     event => {
       event.preventDefault();
@@ -46,7 +41,7 @@ export const QueuePopup = ({
   const handleImageLoaded = useCallback(() => setImageReady(true), [setImageReady]);
 
   const handleRerollTrack = track => {
-    const selectedStreamProvider = _.find(plugins.streamProviders, { source: plugins.selected.streamProviders });
+    const selectedStreamProvider = _.find(plugins.plugins.streamProviders, { sourceName: plugins.selected.streamProviders });
     actions.rerollTrack(selectedStreamProvider, selectedStream, track);
   };
   
@@ -112,5 +107,8 @@ export default compose(
   withState('imageReady', 'setImageReady', false),
   withHandlers({
     handleClose: ({ setOpen }) => () => setOpen(false)
-  })
+  }),
+  withProps(({ track, plugins }) => ({
+    selectedStream: _.find(track.streams, { source: plugins.selected.streamProviders })
+  }))
 )(QueuePopup);
diff --git a/packages/ui/lib/components/StreamInfo/index.js b/packages/ui/lib/components/StreamInfo/index.js
index 52dca6dad4..6eacde072c 100644
--- a/packages/ui/lib/components/StreamInfo/index.js
+++ b/packages/ui/lib/components/StreamInfo/index.js
@@ -22,7 +22,7 @@ const StreamInfo = ({
       <div className={styles.stream_thumbnail}>
         <Img
           alt=''
-          src={selectedStream.thumbnail || track.thumbnail}
+          src={_.get(selectedStream, 'thumbnail') || _.get(track, 'thumbnail')}
           unloader={<img src={artPlaceholder} />}
           onLoad={handleImageLoaded}
         />