diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
index 674c6ef80..ebe30115e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
@@ -128,7 +128,10 @@ public class ReactModalHostView extends ViewGroup implements LifecycleEventListe
 
   private void dismiss() {
     if (mDialog != null) {
-      mDialog.dismiss();
+      Activity currentActivity = getCurrentActivity();
+      if (mDialog.isShowing() && (currentActivity == null || !currentActivity.isFinishing())) {
+        mDialog.dismiss();
+      }
       mDialog = null;
 
       // We need to remove the mHostView from the parent
@@ -209,8 +212,9 @@ public class ReactModalHostView extends ViewGroup implements LifecycleEventListe
     } else if (mAnimationType.equals("slide")) {
       theme = R.style.Theme_FullScreenDialogAnimatedSlide;
     }
-    mDialog = new Dialog(getContext(), theme);
-
+    Activity currentActivity = getCurrentActivity();
+    Context context = currentActivity == null ? getContext() : currentActivity;
+    mDialog = new Dialog(context, theme);
     mDialog.setContentView(getContentView());
     updateProperties();
 
@@ -233,7 +237,7 @@ public class ReactModalHostView extends ViewGroup implements LifecycleEventListe
             } else {
               // We redirect the rest of the key events to the current activity, since the activity
               // expects to receive those events and react to them, ie. in the case of the dev menu
-              Activity currentActivity = ((ReactContext) getContext()).getCurrentActivity();
+              Activity currentActivity = getCurrentActivity();
               if (currentActivity != null) {
                 return currentActivity.onKeyUp(keyCode, event);
               }
@@ -247,7 +251,13 @@ public class ReactModalHostView extends ViewGroup implements LifecycleEventListe
     if (mHardwareAccelerated) {
       mDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
     }
-    mDialog.show();
+    if (currentActivity == null || !currentActivity.isFinishing()) {
+      mDialog.show();
+    }
+  }
+
+  private @Nullable Activity getCurrentActivity() {
+    return ((ReactContext) getContext()).getCurrentActivity();
   }
 
   /**