diff --git a/src/js/components/DropdownField.js b/src/js/components/DropdownField.js
index 1fc019dd..867a76cb 100755
--- a/src/js/components/DropdownField.js
+++ b/src/js/components/DropdownField.js
@@ -50,8 +50,11 @@ export default class DropdownField extends React.Component{
 
 		var icon = <FontAwesome name="check" />
 		if (typeof(this.props.reverse) !== 'undefined'){
-			if (this.props.reverse) icon = <FontAwesome className="reverse" name="caret-down" />
-			else icon = <FontAwesome className="reverse" name="caret-up" />
+			if (this.props.reverse){
+				icon = <FontAwesome className="reverse" name="caret-down" />
+			} else {
+				icon = <FontAwesome className="reverse" name="caret-up" />
+			}
 		}
 
 		return (
diff --git a/src/js/views/library/LibraryAlbums.js b/src/js/views/library/LibraryAlbums.js
index 39d6310a..7765313e 100755
--- a/src/js/views/library/LibraryAlbums.js
+++ b/src/js/views/library/LibraryAlbums.js
@@ -159,14 +159,14 @@ class LibraryAlbums extends React.Component{
 		]
 
 		var sort_options = [
-			{
-				value: 'artists',
-				label: 'Artists'
-			},
 			{
 				value: 'name',
 				label: 'Name'
 			},
+			{
+				value: 'artists',
+				label: 'Artist'
+			},
 			{
 				value: 'added_at',
 				label: 'Added'
@@ -209,8 +209,8 @@ const mapStateToProps = (state, ownProps) => {
 	return {
 		view: state.ui.library_albums_view,
 		albums: state.ui.albums,
-		sort: state.ui.library_albums_sort,
-		sort_reverse: state.ui.library_albums_sort_reverse,
+		sort: (state.ui.library_albums_sort ? state.ui.library_albums_sort : 'name'),
+		sort_reverse: (state.ui.library_albums_sort_reverse ? true : false),
 		library_albums: state.ui.library_albums,
 		library_albums_started: state.ui.library_albums_started,
 		library_albums_more: state.ui.library_albums_more
diff --git a/src/js/views/library/LibraryArtists.js b/src/js/views/library/LibraryArtists.js
index 4fdc859a..daa10ce5 100755
--- a/src/js/views/library/LibraryArtists.js
+++ b/src/js/views/library/LibraryArtists.js
@@ -158,8 +158,8 @@ class LibraryArtists extends React.Component{
 const mapStateToProps = (state, ownProps) => {
 	return {
 		artists: state.ui.artists,
-		sort: state.ui.library_artists_sort,
-		sort_reverse: state.ui.library_artists_sort_reverse,
+		sort: (state.ui.library_artists_sort ? state.ui.library_artists_sort : 'name'),
+		sort_reverse: (state.ui.library_artists_sort_reverse ? true : false),
 		library_artists: state.ui.library_artists,
 		library_artists_started: state.ui.library_artists_started,
 		library_artists_more: state.ui.library_artists_more,
diff --git a/src/js/views/library/LibraryLocalAlbums.js b/src/js/views/library/LibraryLocalAlbums.js
index 5df06a8f..f92297aa 100755
--- a/src/js/views/library/LibraryLocalAlbums.js
+++ b/src/js/views/library/LibraryLocalAlbums.js
@@ -175,8 +175,8 @@ const mapStateToProps = (state, ownProps) => {
 		albums: state.ui.albums,
 		local_albums: state.ui.local_albums,
 		view: state.ui.library_local_albums_view,
-		sort: state.ui.library_local_albums_sort,
-		sort_reverse: state.ui.library_local_albums_sort_reverse
+		sort: (state.ui.library_local_albums_sort ? state.ui.library_local_albums_sort : 'name'),
+		sort_reverse: (state.ui.library_local_albums_sort_reverse ? true : false)
 	}
 }
 
diff --git a/src/js/views/library/LibraryPlaylists.js b/src/js/views/library/LibraryPlaylists.js
index 07b2b785..42f2043f 100755
--- a/src/js/views/library/LibraryPlaylists.js
+++ b/src/js/views/library/LibraryPlaylists.js
@@ -167,8 +167,8 @@ class LibraryPlaylists extends React.Component{
 const mapStateToProps = (state, ownProps) => {
 	return {
 		view: state.ui.library_playlists_view,
-		sort: state.ui.library_playlists_sort,
-		sort_reverse: state.ui.library_playlists_sort_reverse,
+		sort: (state.ui.library_playlists_sort ? state.ui.library_playlists_sort : 'name'),
+		sort_reverse: (state.ui.library_playlists_sort_reverse ? true : false),
 		library_playlists: state.ui.library_playlists,
 		playlists: state.ui.playlists
 	}