diff --git a/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift
index c6c080be8f..ad4510afe7 100644
--- a/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift
+++ b/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift
@@ -1523,12 +1523,16 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         }
         
         switch self.chatPresentationInterfaceState.inputMode {
-            case .none:
-                break
-            default:
-                self.interfaceInteraction?.updateInputModeAndDismissedButtonKeyboardMessageId({ state in
-                    return (.none, state.interfaceState.messageActionsState.closedButtonKeyboardMessageId)
-                })
+        case .none:
+            break
+        case .inputButtons:
+            self.interfaceInteraction?.updateInputModeAndDismissedButtonKeyboardMessageId({ state in
+                return (.none, state.keyboardButtonsMessage?.id ?? state.interfaceState.messageActionsState.closedButtonKeyboardMessageId)
+            })
+        default:
+            self.interfaceInteraction?.updateInputModeAndDismissedButtonKeyboardMessageId({ state in
+                return (.none, state.interfaceState.messageActionsState.closedButtonKeyboardMessageId)
+            })
         }
         self.searchNavigationNode?.deactivate()
     }