diff --git a/Signal/src/view controllers/MessagesViewController.m b/Signal/src/view controllers/MessagesViewController.m
index c6049ca2d..bb9f660b9 100644
--- a/Signal/src/view controllers/MessagesViewController.m	
+++ b/Signal/src/view controllers/MessagesViewController.m	
@@ -1422,6 +1422,8 @@ typedef enum : NSUInteger {
 
 - (void)handleErrorMessageTap:(TSErrorMessage *)message
 {
+    [self dismissKeyBoard];
+
     if ([message isKindOfClass:[TSInvalidIdentityKeyErrorMessage class]]) {
         [self tappedInvalidIdentityKeyErrorMessage:(TSInvalidIdentityKeyErrorMessage *)message];
     } else if (message.errorType == TSErrorMessageInvalidMessage) {
@@ -1481,8 +1483,6 @@ typedef enum : NSUInteger {
         NSLocalizedString(@"ACCEPT_NEW_IDENTITY_ACTION", @"Action sheet item")
     ];
 
-    [self dismissKeyBoard];
-
     [DJWActionSheet showInView:self.parentViewController.view
                      withTitle:titleText
              cancelButtonTitle:NSLocalizedString(@"TXT_CANCEL_TITLE", @"")