diff --git a/submodules/AsyncDisplayKit/Source/ASTextKitComponents.mm b/submodules/AsyncDisplayKit/Source/ASTextKitComponents.mm
index 7bfee153fa..bba12025a8 100644
--- a/submodules/AsyncDisplayKit/Source/ASTextKitComponents.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTextKitComponents.mm
@@ -172,8 +172,10 @@
 
   // If our text-view's width is already the constrained width, we can use our existing TextKit stack for this sizing calculation.
   // Otherwise, we create a temporary stack to size for `constrainedWidth`.
+  UIEdgeInsets additionalInsets = UIEdgeInsetsZero;
   if (CGRectGetWidth(components.textView.threadSafeBounds) != constrainedWidth) {
-    components = [ASTextKitComponents componentsWithAttributedSeedString:components.textStorage textContainerSize:CGSizeMake(constrainedWidth, CGFLOAT_MAX)];
+    additionalInsets = self.textView.textContainerInset;
+    components = [ASTextKitComponents componentsWithAttributedSeedString:components.textStorage textContainerSize:CGSizeMake(constrainedWidth - additionalInsets.left - additionalInsets.right, CGFLOAT_MAX)];
   }
 
   // Force glyph generation and layout, which may not have happened yet (and isn't triggered by -usedRectForTextContainer:).
diff --git a/submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift b/submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift
index a5986e03e5..928cadb6c7 100644
--- a/submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift
+++ b/submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift
@@ -581,13 +581,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
     }
     
     func updateInputTextState(_ state: ChatTextInputState, keepSendButtonEnabled: Bool, extendedSearchLayout: Bool, accessoryItems: [ChatTextInputAccessoryItem], animated: Bool) {
-        if state.inputText.length != 0 && self.textInputNode == nil {
-            self.loadTextInputNode()
-        }
-        
-        if let textInputNode = self.textInputNode, let currentState = self.presentationInterfaceState {
-            self.updatingInputState = true
-            
+        if let currentState = self.presentationInterfaceState {
             var updateAccessoryButtons = false
             if accessoryItems.count == self.accessoryItemButtons.count {
                 for i in 0 ..< accessoryItems.count {
@@ -624,6 +618,14 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
                 }
                 self.accessoryItemButtons = updatedButtons
             }
+        }
+        
+        if state.inputText.length != 0 && self.textInputNode == nil {
+            self.loadTextInputNode()
+        }
+        
+        if let textInputNode = self.textInputNode, let _ = self.presentationInterfaceState {
+            self.updatingInputState = true
             
             var textColor: UIColor = .black
             var accentTextColor: UIColor = .blue