diff --git a/src/containers/ChatBottomPanel/ChatBottomPanel.js b/src/containers/ChatBottomPanel/ChatBottomPanel.js
index 36251a025c498c349b41f57d68adebe8fffa1fa6..550e9e369ff891a9ae3fc30781b0ec79e9b97d5d 100644
--- a/src/containers/ChatBottomPanel/ChatBottomPanel.js
+++ b/src/containers/ChatBottomPanel/ChatBottomPanel.js
@@ -629,7 +629,7 @@ class ChatBottomPanel extends Component {
                   disableUnderline
                   autoComplete="off"
                   multiline
-                  rowsMax="4"
+                  rowsMax="20"
                   onChange={this.handleChange.bind(this)}
                   onKeyDown={this.handleEnter.bind(this)}
                   className={classes.input}
diff --git a/src/containers/ChatBottomPanel/Mentions.styles.js b/src/containers/ChatBottomPanel/Mentions.styles.js
index 177224f91279a08667ec0a84ebb0a19999cbd87a..033c26658fb162791e39e049d856f647e004899c 100644
--- a/src/containers/ChatBottomPanel/Mentions.styles.js
+++ b/src/containers/ChatBottomPanel/Mentions.styles.js
@@ -45,8 +45,12 @@ export default {
       verticalAlign: 'middle',
       caretColor: '#b80000',
       fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif',
-      maxHeight: 64,
-      width: '93%'
+      maxHeight: 320,
+      width: '93%',
+      '& textarea': {
+        top: 4,
+        bottom: 4
+      }
     }
   },