diff --git a/src/android/org/linphone/activities/LinphoneActivity.java b/src/android/org/linphone/activities/LinphoneActivity.java
index 980f7ee1f..832107cb1 100644
--- a/src/android/org/linphone/activities/LinphoneActivity.java
+++ b/src/android/org/linphone/activities/LinphoneActivity.java
@@ -370,6 +370,11 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 		newProxyConfig = true;
 	}
 
+	public void popBackStack() {
+		getFragmentManager().popBackStackImmediate();
+		currentFragment = FragmentsAvailable.EMPTY;
+	}
+
 	private void changeCurrentFragment(FragmentsAvailable newFragmentType, Bundle extras) {
 		changeCurrentFragment(newFragmentType, extras, false);
 	}
diff --git a/src/android/org/linphone/chat/ChatCreationFragment.java b/src/android/org/linphone/chat/ChatCreationFragment.java
index 42677da9c..1ecabcf52 100644
--- a/src/android/org/linphone/chat/ChatCreationFragment.java
+++ b/src/android/org/linphone/chat/ChatCreationFragment.java
@@ -39,6 +39,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import org.linphone.contacts.ContactAddress;
+import org.linphone.mediastream.Log;
 import org.linphone.ui.ContactSelectView;
 import org.linphone.receivers.ContactsUpdatedListener;
 import org.linphone.activities.LinphoneActivity;
@@ -279,7 +280,7 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen
 			allContactsSelected.setVisibility(View.INVISIBLE);
 			updateList();
 		} else if (id == R.id.back) {
-			getFragmentManager().popBackStackImmediate();
+			LinphoneActivity.instance().popBackStack();
 		} else if (id == R.id.next) {
 			if (contactsSelected.size() == 1) {
 				LinphoneActivity.instance().displayChat(contactsSelected.get(0).getAddress(), "", "");
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index 69ff869a2..532700906 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -86,7 +86,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener {
 		mBackButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				getFragmentManager().popBackStackImmediate();
+				LinphoneActivity.instance().popBackStack();
 			}
 		});
 
diff --git a/src/android/org/linphone/chat/GroupInfoFragment.java b/src/android/org/linphone/chat/GroupInfoFragment.java
index 478299d40..6345aa293 100644
--- a/src/android/org/linphone/chat/GroupInfoFragment.java
+++ b/src/android/org/linphone/chat/GroupInfoFragment.java
@@ -32,6 +32,7 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 
 import org.linphone.R;
+import org.linphone.activities.LinphoneActivity;
 import org.linphone.contacts.ContactAddress;
 
 import java.util.ArrayList;
@@ -78,7 +79,7 @@ public class GroupInfoFragment extends Fragment {
 		mBackButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				getFragmentManager().popBackStackImmediate();
+				LinphoneActivity.instance().popBackStack();
 			}
 		});
 
@@ -100,7 +101,7 @@ public class GroupInfoFragment extends Fragment {
 				if (mIsAlreadyCreatedGroup) {
 					//TODO
 				} else {
-					getFragmentManager().popBackStackImmediate();
+					LinphoneActivity.instance().popBackStack();
 				}
 			}
 		});