diff --git a/src/js/components/ContextMenu.js b/src/js/components/ContextMenu.js
index e491630e..1aa59037 100755
--- a/src/js/components/ContextMenu.js
+++ b/src/js/components/ContextMenu.js
@@ -107,10 +107,12 @@ class ContextMenu extends React.Component{
 
 	renderPlaylistSubmenu(){
 		var playlists = []
-		for( var i = 0; i < this.props.playlists.length; i++ ){
-			if( this.props.playlists[i].can_edit ) playlists.push( this.props.playlists[i] )
+		for (var uri in this.props.playlists){
+			if (this.props.playlists[uri].can_edit) playlists.push( this.props.playlists[uri])
 		}
 
+		playlists = helpers.sortItems(playlists, 'name')
+
 		return (			
 			<div className="submenu">
 				{
diff --git a/src/js/components/Modal/AddToPlaylistModal.js b/src/js/components/Modal/AddToPlaylistModal.js
index 3b95e25e..dc14db52 100755
--- a/src/js/components/Modal/AddToPlaylistModal.js
+++ b/src/js/components/Modal/AddToPlaylistModal.js
@@ -18,10 +18,12 @@ export default class AddToPlaylistModal extends React.Component{
 	render(){
 		if( !this.props.playlists ) return <div className="empty">No editable playlists</div>
 		var playlists = []
-		for( var i = 0; i < this.props.playlists.length; i++ ){
-			if( this.props.playlists[i].can_edit ) playlists.push( this.props.playlists[i] )
+		for (var uri in this.props.playlists){
+			if( this.props.playlists[uri].can_edit ) playlists.push( this.props.playlists[uri] )
 		}
 
+		playlists = helpers.sortItems(playlists, 'name')
+
 		return (
 			<div>
 				<h4>Add to playlist</h4>
diff --git a/src/js/helpers.js b/src/js/helpers.js
index 3cbe09fa..41d653fd 100755
--- a/src/js/helpers.js
+++ b/src/js/helpers.js
@@ -351,7 +351,7 @@ export let sortItems = function (array, property, reverse = false){
 		}
 	}
 
-	var sorted = array.sort(compare)
+	var sorted = Object.assign([], array.sort(compare))
 	if( reverse ) sorted.reverse()
 	return sorted
 }