diff --git a/src/usecase/buffers/ui/BufferContainer.tsx b/src/usecase/buffers/ui/BufferContainer.tsx
index 517fa92..a9ce1e4 100644
--- a/src/usecase/buffers/ui/BufferContainer.tsx
+++ b/src/usecase/buffers/ui/BufferContainer.tsx
@@ -21,6 +21,7 @@ import { getParseArgs } from "../../../lib/helpers/parse-text-args";
 import { formatUrl } from "../../../lib/helpers/url-formatter";
 import { renderWeechatFormat } from "../../../lib/weechat/color-formatter";
 import { StoreState } from "../../../store";
+import UndoTextInput from "./UndoTextInput";
 
 interface Props {
   buffer: WeechatBuffer | null;
@@ -72,6 +73,7 @@ class BufferContainer extends React.Component<Props, State> {
       showTabButton: false
     });
   }
+
   handleOnLongPress(type, text) {
     ActionSheetIOS.showShareActionSheetWithOptions(
       {
@@ -82,6 +84,7 @@ class BufferContainer extends React.Component<Props, State> {
       () => null
     );
   }
+
   handleOnPress(type, text) {
     console.log(type, text);
     if (type === "channel") {
@@ -178,7 +181,7 @@ class BufferContainer extends React.Component<Props, State> {
           parseArgs={this.parseArgs}
         />
         <View style={styles.bottomBox}>
-          <TextInput
+          <UndoTextInput
             style={styles.inputBox}
             value={textValue}
             onChangeText={this.handleChangeText}
diff --git a/src/usecase/buffers/ui/UndoTextInput.tsx b/src/usecase/buffers/ui/UndoTextInput.tsx
new file mode 100644
index 0000000..1f01038
--- /dev/null
+++ b/src/usecase/buffers/ui/UndoTextInput.tsx
@@ -0,0 +1,37 @@
+import * as React from "react";
+import { TextInput } from 'react-native';
+
+type Props = React.ComponentProps<typeof TextInput>;
+
+export default class UndoTextInput extends React.PureComponent<Props> {
+  constructor(props: Props) {
+    super(props)
+    this.value = props.value;
+  }
+
+  textInput: TextInput;
+  value: string;
+
+  componentDidUpdate() {
+    const { value } = this.props;
+    if (value !== this.value) {
+      this.textInput.setNativeProps({ text: value })
+      this.value = value;
+    }
+  }
+
+  handleChangeText = (textValue: string) => {
+    this.value = textValue;
+    this.props.onChangeText(textValue);
+  }
+
+  render() {
+    const { value, onChangeText, ...rest } = this.props;
+    return (
+        <TextInput {...rest}
+          ref={input => this.textInput = input}
+          onChangeText={this.handleChangeText}
+      />
+    );
+  }
+}
\ No newline at end of file