diff --git a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
index 614c5ebe..85a74447 100644
--- a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
@@ -428,9 +428,6 @@ public class FullPlaybackActivity extends PlaybackActivity
 				dialog.create().show();
 			}
 			break;
-		case MENU_SHOW_QUEUE:
-			startActivity(new Intent(this, ShowQueueActivity.class));
-			break;
 		default:
 			return super.onOptionsItemSelected(item);
 		}
diff --git a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
index 0a48704d..7109c842 100644
--- a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
@@ -795,6 +795,9 @@ public class LibraryActivity
 		controls.setActionView(mActionControls);
 		controls.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
+		// Call super after adding the now-playing view as this should be the first item
+		super.onCreateOptionsMenu(menu);
+
 		mSearchMenuItem = menu.add(0, MENU_SEARCH, 0, R.string.search).setIcon(R.drawable.ic_menu_search);
 		mSearchMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW | MenuItem.SHOW_AS_ACTION_ALWAYS);
 		SearchView mSearchView = new SearchView(getActionBar().getThemedContext());
@@ -802,7 +805,9 @@ public class LibraryActivity
 		mSearchMenuItem.setActionView(mSearchView);
 
 		menu.add(0, MENU_SORT, 0, R.string.sort_by).setIcon(R.drawable.ic_menu_sort_alphabetically);
-		return super.onCreateOptionsMenu(menu);
+		menu.add(0, MENU_SHOW_QUEUE, 0, R.string.show_queue);
+
+		return true;
 	}
 
 	@Override
diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java
index f5e8c6fa..54bda519 100644
--- a/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java
@@ -371,6 +371,9 @@ public abstract class PlaybackActivity extends Activity
 		case MENU_CLEAR_QUEUE:
 			PlaybackService.get(this).clearQueue();
 			break;
+		case MENU_SHOW_QUEUE:
+			startActivity(new Intent(this, ShowQueueActivity.class));
+			break;
 		default:
 			return false;
 		}