diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 6d989d669..9b58f6621 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -2030,6 +2030,11 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     roomInputView.actionsBar.actionItems = actionItems;
 }
 
+- (NSString *)textInputContextIdentifier
+{
+    return self.roomDataSource.roomId;
+}
+
 - (void)roomInputToolbarViewPresentStickerPicker
 {
     // Search for the sticker picker widget in the user account
diff --git a/changelog.d/5067.feature b/changelog.d/5067.feature
new file mode 100644
index 000000000..53e0a66b5
--- /dev/null
+++ b/changelog.d/5067.feature
@@ -0,0 +1 @@
+Remember keyboard layout per room and restore it when opening the room again.