diff --git a/Signal/src/view controllers/MessagesViewController.m b/Signal/src/view controllers/MessagesViewController.m
index bf628e3ff..df1fc8645 100644
--- a/Signal/src/view controllers/MessagesViewController.m	
+++ b/Signal/src/view controllers/MessagesViewController.m	
@@ -684,10 +684,23 @@ typedef enum : NSUInteger {
             failure:^(NSError *error) {
                 DDLogWarn(@"%@ Failed to deliver message with error: %@", self.tag, error);
             }];
+        [self toggleDefaultKeyboard];
         [self finishSendingMessage];
     }
 }
 
+- (void)toggleDefaultKeyboard
+{
+    NSString *mode = [self.inputToolbar.contentView.textView.textInputMode primaryLanguage];
+    // Mode is nil for the emoji keyboard
+    if (mode) {
+        [self.keyboardController endListeningForKeyboard];
+        [self dismissKeyBoard];
+        [self popKeyBoard];
+        [self.keyboardController beginListeningForKeyboard];
+    }
+}
+
 #pragma mark - UICollectionViewDelegate
 
 // Override JSQMVC