diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
index 272692e95..8a24dad36 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
@@ -66,6 +66,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	private int currentTab=R.id.tab_home;
 
 	private String accountID;
+	private boolean isPleroma;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -73,18 +74,20 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		E.register(this);
 		accountID=getArguments().getString("account");
 		setTitle(R.string.sk_app_name);
+		Instance instance = AccountSessionManager.getInstance().getAccount(accountID).getInstance();
+		isPleroma = instance.isPleroma();
 
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
 			setRetainInstance(true);
 
+		// TODO: clean up
 		if(savedInstanceState==null){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
 			homeTabFragment=new HomeTabFragment();
 			homeTabFragment.setArguments(args);
 			args=new Bundle(args);
-			Instance instance = AccountSessionManager.getInstance().getAccount(accountID).getInstance();
-			args.putBoolean("isPleroma", instance.isPleroma());
+			args.putBoolean("disableDiscover", isPleroma);
 			args.putBoolean("noAutoLoad", true);
 			searchFragment=new DiscoverFragment();
 			searchFragment.setArguments(args);
@@ -233,8 +236,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		if (newFragment instanceof HasFab fabulous) fabulous.showFab();
 		currentTab=tab;
 		((FragmentStackActivity)getActivity()).invalidateSystemBarColors(this);
-		if (tab == R.id.tab_search)
-			searchFragment.selectSearch();
+		if (tab == R.id.tab_search && isPleroma) searchFragment.selectSearch();
 	}
 
 	private void maybeTriggerLoading(Fragment newFragment){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
index 0fb383eca..b4bed11f7 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
@@ -273,7 +273,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		searchBack.setEnabled(false);
 		searchBack.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
 		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(searchEdit.getWindowToken(), 0);
-		if (getArguments().getBoolean("isPleroma"))
+		if (getArguments().getBoolean("disableDiscover"))
 			((HomeFragment) getParentFragment()).onBackPressed();
 	}