diff --git a/src/js/components/Thumbnail.js b/src/js/components/Thumbnail.js
index b9bf5c6d..e14464a3 100755
--- a/src/js/components/Thumbnail.js
+++ b/src/js/components/Thumbnail.js
@@ -66,9 +66,10 @@ class Thumbnail extends React.Component{
 	render(){
 		var image = this.mapImageSizes()
 		var style = { backgroundImage: 'url("'+image+'")' }
-		var class_name = 'thumbnail '+this.props.size;
-		if( this.props.circle ) class_name += ' circle';
-		if( this.props.className ) class_name += ' '+this.props.className;
+		var class_name = 'thumbnail '
+		if( this.props.size ) class_name += ' '+this.props.size
+		if( this.props.circle ) class_name += ' circle'
+		if( this.props.className ) class_name += ' '+this.props.className
 		
 		var zoom_icon = null
 		if (this.props.canZoom){
diff --git a/src/js/views/discover/DiscoverFeatured.js b/src/js/views/discover/DiscoverFeatured.js
index 9c4a39cb..28f04492 100755
--- a/src/js/views/discover/DiscoverFeatured.js
+++ b/src/js/views/discover/DiscoverFeatured.js
@@ -10,6 +10,7 @@ import Parallax from '../../components/Parallax'
 import Thumbnail from '../../components/Thumbnail'
 
 import * as helpers from '../../helpers'
+import * as uiActions from '../../services/ui/actions'
 import * as mopidyActions from '../../services/mopidy/actions'
 import * as spotifyActions from '../../services/spotify/actions'
 
@@ -27,14 +28,27 @@ class DiscoverFeatured extends React.Component{
         this.props.mopidyActions.playPlaylist(playlist.uri)
 	}
 
+	handleContextMenu(e,item){
+		e.preventDefault()
+		var data = { 
+			e: e,
+			context: 'playlist',
+			uris: [item.uri],
+			items: [item]
+		}
+		this.props.uiActions.showContextMenu(data)
+	}
+
 	renderIntro(playlist = null){
 		if (playlist){
 			return (
 				<div className="intro">
 					<Parallax image={helpers.sizedImages(playlist.images).huge} blur />
 					<div className="content cf">
-						<Link to={global.baseURL+'playlist/'+playlist.uri}>
-							<Thumbnail images={playlist.images} />
+						<Link 
+							to={global.baseURL+'playlist/'+playlist.uri}
+							onContextMenu={e => this.handleContextMenu(e,playlist)}>
+								<Thumbnail images={playlist.images} />
 						</Link>
 						<Link to={global.baseURL+'playlist/'+playlist.uri}>
 							<h1>{playlist.name}</h1>
@@ -112,6 +126,7 @@ const mapStateToProps = (state, ownProps) => {
 
 const mapDispatchToProps = (dispatch) => {
 	return {
+		uiActions: bindActionCreators(uiActions, dispatch),
 		mopidyActions: bindActionCreators(mopidyActions, dispatch),
 		spotifyActions: bindActionCreators(spotifyActions, dispatch)
 	}
diff --git a/src/js/views/discover/DiscoverNewReleases.js b/src/js/views/discover/DiscoverNewReleases.js
index f8856eb3..333d6efd 100755
--- a/src/js/views/discover/DiscoverNewReleases.js
+++ b/src/js/views/discover/DiscoverNewReleases.js
@@ -34,14 +34,27 @@ class DiscoverNewReleases extends React.Component{
         this.props.mopidyActions.playURIs([album.uri],album.uri)
 	}
 
+	handleContextMenu(e,item){
+		e.preventDefault()
+		var data = { 
+			e: e,
+			context: 'album',
+			uris: [item.uri],
+			items: [item]
+		}
+		this.props.uiActions.showContextMenu(data)
+	}
+
 	renderIntro(album = null){
 		if (album){
 			return (
 				<div className="intro">
 					<Parallax image={helpers.sizedImages(album.images).huge} blur />
 					<div className="content cf">
-						<Link to={global.baseURL+'album/'+album.uri}>
-							<Thumbnail images={album.images} />
+						<Link 
+							to={global.baseURL+'album/'+album.uri}
+							onContextMenu={e => this.handleContextMenu(e,album)}>
+								<Thumbnail images={album.images} />
 						</Link>
 						<Link to={global.baseURL+'album/'+album.uri}>
 							<h1>{album.name}</h1>