diff --git a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java
index 739b12d..2b15c03 100644
--- a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java
+++ b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java
@@ -418,7 +418,7 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
     @Override
     public void onBackPressed() {
         if (slideUpPanel.getPanelState() == SlidingUpPanelLayout.PanelState.EXPANDED && secondaryFragment == null) {
-            slideUpPanel.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+            closeNowPlaying();
         } else if (slideUpPanel.getPanelState() == SlidingUpPanelLayout.PanelState.EXPANDED) {
             removeCurrent();
         } else {
@@ -488,7 +488,7 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
         super.drawerItemSelected(fragmentType);
 
         if (slideUpPanel.getPanelState() == SlidingUpPanelLayout.PanelState.EXPANDED) {
-            slideUpPanel.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+            closeNowPlaying();
         }
     }