diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 3f3265d45..de6543114 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -961,6 +961,8 @@
                     console.log('Error pulling attached files before send');
                     this.focusMessageField();
                 }.bind(this));
+            } else {
+                this.focusMessageField();
             }
         },