diff --git a/src/js/components/AlbumGrid.js b/src/js/components/AlbumGrid.js
index e4c27c3b..3068979b 100755
--- a/src/js/components/AlbumGrid.js
+++ b/src/js/components/AlbumGrid.js
@@ -25,10 +25,12 @@ class AlbumGrid extends React.Component{
 	handleContextMenu(e,item){
 		e.preventDefault()
 		var data = { 
+			e: e,
+			context: 'album',
 			uris: [item.uri],
 			item: item
 		}
-		this.props.uiActions.showContextMenu( e, data, 'album', 'click' )
+		this.props.uiActions.showContextMenu(data)
 	}
 
 	render(){
diff --git a/src/js/components/ArtistGrid.js b/src/js/components/ArtistGrid.js
index 9088c1f2..6ef38e01 100755
--- a/src/js/components/ArtistGrid.js
+++ b/src/js/components/ArtistGrid.js
@@ -16,11 +16,13 @@ class ArtistGrid extends React.Component{
 
 	handleContextMenu(e,item){
 		e.preventDefault()
-		var data = { 
+		var data = {
+			e: e,
+			context: 'artist',
 			uris: [item.uri],
 			item: item
 		}
-		this.props.uiActions.showContextMenu( e, data, 'artist', 'click' )
+		this.props.uiActions.showContextMenu(data)
 	}
 
 	render(){
diff --git a/src/js/components/ContextMenu.js b/src/js/components/ContextMenu.js
index 06fc53d7..1137f870 100755
--- a/src/js/components/ContextMenu.js
+++ b/src/js/components/ContextMenu.js
@@ -254,6 +254,7 @@ class ContextMenu extends React.Component{
 		var height = 0
 		if (items) height = items.length * 34 // this is an approximation of how tall each menu item is
 
+		var className = "context-menu"
 		if (this.props.menu.position_x > (window.innerWidth - 154)) className += ' right-align'
 		if (this.props.menu.position_x > (window.innerWidth - 308)) className += ' right-align-submenu'
 		if (this.props.menu.position_y > (window.innerHeight - height)){
@@ -262,7 +263,7 @@ class ContextMenu extends React.Component{
 		}
 
 		return (
-			<div className="context-menu" style={style}>
+			<div className={className} style={style}>
 				{this.props.menu.item ? this.renderTitle() : null}
 				{this.renderItems()}
 			</div>
diff --git a/src/js/components/List.js b/src/js/components/List.js
index 43f5c8cb..61c9ffec 100755
--- a/src/js/components/List.js
+++ b/src/js/components/List.js
@@ -27,11 +27,13 @@ class List extends React.Component{
 
 	handleContextMenu(e,item){
 		e.preventDefault()
-		var data = { 
+		var data = {
+			e: e,
+			context: helpers.uriType(item.uri),
 			uris: [item.uri],
 			item: item
 		}
-		this.props.uiActions.showContextMenu(e, data, helpers.uriType(item.uri), 'click')
+		this.props.uiActions.showContextMenu(data)
 	}
 
 	renderHeader(){
diff --git a/src/js/components/PlaylistGrid.js b/src/js/components/PlaylistGrid.js
index 6ce3924a..61ecb7c2 100755
--- a/src/js/components/PlaylistGrid.js
+++ b/src/js/components/PlaylistGrid.js
@@ -17,11 +17,13 @@ class PlaylistGrid extends React.Component{
 
 	handleContextMenu(e,item){
 		e.preventDefault()
-		var data = { 
+		var data = {
+			e: e,
+			context: 'playlist',
 			uris: [item.uri],
 			item: item
 		}
-		this.props.uiActions.showContextMenu( e, data, 'playlist', 'click' )
+		this.props.uiActions.showContextMenu(data)
 	}
 
 	render(){