2 files changed, 7 insertions, 7 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index e32dbdee..52b22695 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -329,7 +329,7 @@ public class Dashboard extends Activity implements SessionDialog.SessionDialogIn
 	FragmentTransaction transaction = fragment_manager.removePreviousFragment(SessionDialog.TAG);
 
 	DialogFragment newFragment = SessionDialog.newInstance();
-	if(resultData != null && !resultData.isEmpty())
+	if(resultData != null && !resultData.isEmpty() && fragment_manager.findFragmentByTag(SessionDialog.TAG) == null)
 	    newFragment.setArguments(resultData);
 	newFragment.show(transaction, SessionDialog.TAG);
     }
@@ -378,7 +378,7 @@ public class Dashboard extends Activity implements SessionDialog.SessionDialogIn
 	FragmentTransaction transaction = fragment_manager.removePreviousFragment(SessionDialog.TAG);
 
 	DialogFragment newFragment = SessionDialog.newInstance();
-	if(resultData != null && !resultData.isEmpty()) {
+	if(resultData != null && !resultData.isEmpty() && fragment_manager.findFragmentByTag(SessionDialog.TAG) == null) {
 	    newFragment.setArguments(resultData);
 	}
 	newFragment.show(transaction, SessionDialog.TAG);
diff --git a/app/src/main/java/se/leap/bitmaskclient/SessionDialog.java b/app/src/main/java/se/leap/bitmaskclient/SessionDialog.java
index 22e0f128..fd9ca851 100644
--- a/app/src/main/java/se/leap/bitmaskclient/SessionDialog.java
+++ b/app/src/main/java/se/leap/bitmaskclient/SessionDialog.java
@@ -129,15 +129,15 @@ public class SessionDialog extends DialogFragment{
 
 	SessionDialogInterface interface_with_Dashboard;
 
-	/**
-	 * @return a new instance of this DialogFragment.
-	 */
-	public static DialogFragment newInstance() {
+    /**
+     * @return a new instance of this DialogFragment.
+     */
+    public static DialogFragment newInstance() {
         if(dialog == null)
             dialog = new SessionDialog();
 
         return dialog;
-	}
+    }
 	
     @Override
     public void onAttach(Activity activity) {