diff --git a/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java
index 3dc3bf09492cdc9f15995360f24e1404759474d0..e52d5b6b9013b6162afe4071237e1002ef9e8128 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java
@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.support.annotation.CallSuper;
 import android.support.annotation.UiThread;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
 import android.view.MenuItem;
 
 import org.briarproject.bramble.api.db.DbException;
@@ -56,8 +57,8 @@ public abstract class BaseFragment extends Fragment
 
 	@UiThread
 	protected void finish() {
-		if (!isDetached())
-			getActivity().supportFinishAfterTransition();
+		FragmentActivity activity = getActivity();
+		if (activity != null) activity.supportFinishAfterTransition();
 	}
 
 	public interface BaseFragmentListener {