diff --git a/Riot/ViewController/BugReportViewController.m b/Riot/ViewController/BugReportViewController.m
index e1eacfe208..a69bb7d0b2 100644
--- a/Riot/ViewController/BugReportViewController.m
+++ b/Riot/ViewController/BugReportViewController.m
@@ -127,6 +127,8 @@ -(void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
 
+    [self dismissKeyboard];
+
     if (screenShotFile)
     {
         [[NSFileManager defaultManager] removeItemAtURL:screenShotFile error:nil];
@@ -161,6 +163,12 @@ - (void)setSendScreenshot:(BOOL)sendScreenshot
 }
 
 #pragma mark - MXKViewController
+- (void)dismissKeyboard
+{
+    // Hide the keyboard
+    [_bugReportDescriptionTextView resignFirstResponder];
+}
+
 - (void)onKeyboardShowAnimationComplete
 {
     self.keyboardView = _bugReportDescriptionTextView.inputAccessoryView.superview;