diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
index 811d46f2c9..fb21152181 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
@@ -87,6 +87,8 @@ public class SubscriptionFragment extends Fragment
     private Disposable disposable;
     private SharedPreferences prefs;
 
+    private FloatingActionButton subscriptionAddButton;
+
     private SpeedDialView speedDialView;
 
     private List<NavDrawerData.DrawerItem> listItems;
@@ -155,7 +157,7 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMen
         progressBar = root.findViewById(R.id.progressBar);
         progressBar.setVisibility(View.VISIBLE);
 
-        FloatingActionButton subscriptionAddButton = root.findViewById(R.id.subscriptions_add);
+        subscriptionAddButton = root.findViewById(R.id.subscriptions_add);
         subscriptionAddButton.setOnClickListener(view -> {
             if (getActivity() instanceof MainActivity) {
                 ((MainActivity) getActivity()).loadChildFragment(new AddFeedFragment());
@@ -173,16 +175,6 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMen
         speedDialView = root.findViewById(R.id.fabSD);
         speedDialView.setOverlayLayout(root.findViewById(R.id.fabSDOverlay));
         speedDialView.inflate(R.menu.nav_feed_action_speeddial);
-        speedDialView.setOnChangeListener(new SpeedDialView.OnChangeListener() {
-            @Override
-            public boolean onMainActionSelected() {
-                return false;
-            }
-
-            @Override
-            public void onToggleChanged(boolean isOpen) {
-            }
-        });
         speedDialView.setOnActionSelectedListener(actionItem -> {
             new FeedMultiSelectActionHandler((MainActivity) getActivity(), subscriptionAdapter.getSelectedItems())
                     .handleAction(actionItem.getId());
@@ -336,7 +328,6 @@ public boolean onContextItemSelected(MenuItem item) {
 
         Feed feed = ((NavDrawerData.FeedDrawerItem) drawerItem).feed;
         if (itemId == R.id.multi_select) {
-            speedDialView.setVisibility(View.VISIBLE);
             return subscriptionAdapter.onContextItemSelected(item);
         }
         return FeedMenuHandler.onMenuItemClicked(this, item.getItemId(), feed, this::loadSubscriptions);
@@ -356,6 +347,7 @@ public void onUnreadItemsChanged(UnreadItemsUpdateEvent event) {
     public void onEndSelectMode() {
         speedDialView.close();
         speedDialView.setVisibility(View.GONE);
+        subscriptionAddButton.setVisibility(View.VISIBLE);
         subscriptionAdapter.setItems(listItems);
     }
 
@@ -368,5 +360,7 @@ public void onStartSelectMode() {
             }
         }
         subscriptionAdapter.setItems(feedsOnly);
+        speedDialView.setVisibility(View.VISIBLE);
+        subscriptionAddButton.setVisibility(View.GONE);
     }
 }