diff --git a/src/mumble/CustomElements.cpp b/src/mumble/CustomElements.cpp
index 9cf967089..2375e86c6 100644
--- a/src/mumble/CustomElements.cpp
+++ b/src/mumble/CustomElements.cpp
@@ -136,7 +136,9 @@ QSize ChatbarTextEdit::minimumSizeHint() const {
 
 QSize ChatbarTextEdit::sizeHint() const {
 	QSize sh = QTextEdit::sizeHint();
-	sh.setHeight(static_cast<qint32>(document()->documentLayout()->documentSize().height()));
+	const int minHeight = minimumSizeHint().height();
+	const int documentHeight = document()->documentLayout()->documentSize().height();
+	sh.setHeight(std::max(minHeight, documentHeight));
 	const_cast<ChatbarTextEdit *>(this)->setMaximumHeight(sh.height());
 	return sh;
 }