diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m
index 3dfdfb7bb..154b670d2 100644
--- a/Classes/ChatRoomViewController.m
+++ b/Classes/ChatRoomViewController.m
@@ -124,6 +124,9 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
+    
+    [messageField resignFirstResponder];
+    
     if(chatRoom != NULL) {
         linphone_chat_room_destroy(chatRoom);
         chatRoom = NULL;