diff --git a/src/audio_call.c b/src/audio_call.c
index 357dfea..6003a8a 100644
--- a/src/audio_call.c
+++ b/src/audio_call.c
@@ -570,7 +570,7 @@ void cmd_hangup(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
 {
     const char *error_str = NULL;
 
-    if ( !self->is_call) {
+    if ( !self->is_call ) {
         error_str = "Not in a call.";
         goto on_error;
     }
@@ -587,11 +587,8 @@ void cmd_hangup(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
 
 #ifdef VIDEO
     callback_video_end(self->num);
-
 #endif /* VIDEO */
 
-
-
     if ( CallControl.pending_call ) {
         /* Manually send a cancel call control because call hasn't started */
         toxav_call_control(CallControl.av, self->num, TOXAV_CALL_CONTROL_CANCEL, NULL);
@@ -836,6 +833,8 @@ on_error:
 
 void stop_current_call(ToxWindow* self)
 {
-    TOXAV_ERR_CALL_CONTROL error;
-    toxav_call_control(CallControl.av, self->num, TOXAV_CALL_CONTROL_CANCEL, &error);
+    Call *this_call = &CallControl.calls[self->num];
+
+    if (this_call && self->is_call)
+        stop_transmission(this_call, self->num);
 }
diff --git a/src/chat.c b/src/chat.c
index 662236c..0e59c85 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -68,7 +68,7 @@ static void kill_infobox(ToxWindow *self);
 #ifdef AUDIO
 #define AC_NUM_CHAT_COMMANDS 30
 #else
-#define AC_NUM_CHAT_COMMANDS 23
+#define AC_NUM_CHAT_COMMANDS 22
 #endif /* AUDIO */
 
 /* Array of chat command names used for tab completion. */
@@ -95,7 +95,6 @@ static const char chat_cmd_list[AC_NUM_CHAT_COMMANDS][MAX_CMDNAME_SIZE] = {
     { "/savefile"   },
     { "/sendfile"   },
     { "/status"     },
-    { "/video"      },
 
 #ifdef AUDIO
 
@@ -106,6 +105,7 @@ static const char chat_cmd_list[AC_NUM_CHAT_COMMANDS][MAX_CMDNAME_SIZE] = {
     { "/sdev"       },
     { "/mute"       },
     { "/sense"      },
+    { "/video"      },
 
 #endif /* AUDIO */
 };