diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 5bb8113a1..61a23e770 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -206,7 +206,7 @@ public class ConversationActivity extends XmppActivity {
 			@Override
 			public void onPanelClosed(View arg0) {
 				paneShouldBeOpen = false;
-				if (conversationList.size() > 0) {
+				if ((conversationList.size() > 0)&&(getSelectedConversation()!=null)) {
 					getActionBar().setDisplayHomeAsUpEnabled(true);
 					getActionBar().setTitle(getSelectedConversation().getName(useSubject));
 					invalidateOptionsMenu();