diff --git a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
index 505cd2f..e0d9b2c 100644
--- a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
+++ b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
@@ -533,21 +533,13 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
         finish();
     }
 
-    boolean onBackPressedSupport() {
-        if (drawerOpen) {
-            drawer.closeDrawers();
-            return false;
-        } else if (backStack.size() > 0) {
-            removeCurrent();
-            return false;
-        } else {
-            return true;
-        }
-    }
-
     @Override
     public void onBackPressed() {
-        if (onBackPressedSupport()) {
+        if (drawerOpen) {
+            drawer.closeDrawers();
+        } else if (backStack.size() > 0) {
+            removeCurrent();
+        } else {
             super.onBackPressed();
         }
     }
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 579d805..70b6d49 100644
--- a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java
+++ b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java
@@ -421,18 +421,10 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
     public void onBackPressed() {
         if (slideUpPanel.getPanelState() == SlidingUpPanelLayout.PanelState.EXPANDED && secondaryFragment == null) {
             slideUpPanel.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
-        } else if (onBackPressedSupport()) {
-            finish();
-        }
-    }
-
-    @Override
-    boolean onBackPressedSupport() {
-        if (slideUpPanel.getPanelState() == SlidingUpPanelLayout.PanelState.EXPANDED) {
+        } else if (slideUpPanel.getPanelState() == SlidingUpPanelLayout.PanelState.EXPANDED) {
             removeCurrent();
-            return false;
         } else {
-            return super.onBackPressedSupport();
+            super.onBackPressed();
         }
     }