diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/PreferencesActivity.java b/app/src/main/java/ch/blinkenlights/android/vanilla/PreferencesActivity.java
index a1f56a6f..54455eff 100644
--- a/app/src/main/java/ch/blinkenlights/android/vanilla/PreferencesActivity.java
+++ b/app/src/main/java/ch/blinkenlights/android/vanilla/PreferencesActivity.java
@@ -280,7 +280,10 @@ public class PreferencesActivity extends PreferenceActivity
 
 			if (intent != null) {
 				startActivity(intent);
-				activity.onBackPressed();
+				FragmentManager fragmentManager = getFragmentManager();
+				if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O || !fragmentManager.isStateSaved()) {
+					fragmentManager.popBackStack();
+				}
 			} else {
 				// package is not installed, ask user to install it
 				new AlertDialog.Builder(activity)