diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
index 86610953d..b95da38ad 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
@@ -569,8 +569,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     } else if (itemId == R.id.menu_show_map) {
       WebxdcActivity.openMaps(this, chatId);
       return true;
-    } else if (itemId == R.id.menu_start_call) {
-      showCallOptionsDialog();
+    } else if (itemId == R.id.menu_audio_call) {
+      CallUtil.startCall(this, chatId, true);
+      return true;
+    } else if (itemId == R.id.menu_video_call) {
+      CallUtil.startCall(this, chatId, false);
       return true;
     } else if (itemId == R.id.menu_all_media) {
       handleAllMedia();
@@ -697,22 +700,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     dcChat = dcContext.getChat(chatId);
   }
 
-  private void showCallOptionsDialog() {
-    CharSequence[] items = {
-        getString(R.string.start_audio_call),
-        getString(R.string.start_video_call)
-    };
-
-    new AlertDialog.Builder(this)
-        .setTitle(R.string.start_call)
-        .setItems(items, (dialog, which) -> {
-          boolean audioOnly = (which == 0);
-          CallUtil.startCall(this, chatId, audioOnly);
-        })
-        .setNegativeButton(R.string.cancel, null)
-        .show();
-  }
-
   private void handleDeleteChat() {
     AlertDialog dialog = new AlertDialog.Builder(this)
         .setMessage(getResources().getString(R.string.ask_delete_named_chat, dcChat.getName()))
diff --git a/src/main/res/menu/conversation.xml b/src/main/res/menu/conversation.xml
index 636436bcc..5536d0e15 100644
--- a/src/main/res/menu/conversation.xml
+++ b/src/main/res/menu/conversation.xml
@@ -28,7 +28,14 @@
     <item android:id="@+id/menu_start_call"
         android:title="@string/start_call"
         android:icon="@drawable/ic_videocam_white_24dp"
-        app:showAsAction="always" />
+        app:showAsAction="always">
+        <menu>
+            <item android:id="@+id/menu_audio_call"
+                android:title="@string/start_audio_call" />
+            <item android:id="@+id/menu_video_call"
+                android:title="@string/start_video_call" />
+        </menu>
+    </item>
 
     <item android:id="@+id/menu_all_media"
         android:title="@string/apps_and_media"