diff --git a/go.mod b/go.mod
index 940fa1fc..6e4f996d 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/Bios-Marcel/discordgo v0.20.4-0.20191007163810-41c4e4a91fd6
 	github.com/Bios-Marcel/goclipimg v0.0.0-20190417192721-b58a8831f27d
 	github.com/Bios-Marcel/shortnotforlong v1.0.0
-	github.com/Bios-Marcel/tview v0.0.0-20191008165233-c1d70afae712
+	github.com/Bios-Marcel/tview v0.0.0-20191010190327-42c5245b3d25
 	github.com/alecthomas/chroma v0.6.6
 	github.com/atotto/clipboard v0.1.2
 	github.com/gdamore/tcell v1.3.0
diff --git a/go.sum b/go.sum
index 8f31338f..b448846e 100644
--- a/go.sum
+++ b/go.sum
@@ -12,6 +12,12 @@ github.com/Bios-Marcel/tview v0.0.0-20191005105220-888684dabd6b h1:Z4pYp0FKemDpt
 github.com/Bios-Marcel/tview v0.0.0-20191005105220-888684dabd6b/go.mod h1:AtXfMotMUyN+IQ7JwQyvrWr9dQN+TNRlq+slKB0fmQc=
 github.com/Bios-Marcel/tview v0.0.0-20191008165233-c1d70afae712 h1:woFPJ1+2P7cPwDO7ES0WqEZ5Gr7uomx2mX+waHZDFlg=
 github.com/Bios-Marcel/tview v0.0.0-20191008165233-c1d70afae712/go.mod h1:AtXfMotMUyN+IQ7JwQyvrWr9dQN+TNRlq+slKB0fmQc=
+github.com/Bios-Marcel/tview v0.0.0-20191010184840-e957ee729af5 h1:fpOcmkGt7VZAZM+vLHxEsyoHyMiPHus5gDrJluQdhH8=
+github.com/Bios-Marcel/tview v0.0.0-20191010184840-e957ee729af5/go.mod h1:AtXfMotMUyN+IQ7JwQyvrWr9dQN+TNRlq+slKB0fmQc=
+github.com/Bios-Marcel/tview v0.0.0-20191010185340-4087ce6a56dd h1:1lP9nen8TalO7/wh4nGsYMK0QtaKRzoJ5I/cfGjDMZM=
+github.com/Bios-Marcel/tview v0.0.0-20191010185340-4087ce6a56dd/go.mod h1:AtXfMotMUyN+IQ7JwQyvrWr9dQN+TNRlq+slKB0fmQc=
+github.com/Bios-Marcel/tview v0.0.0-20191010190327-42c5245b3d25 h1:6qaZmnHVaTfn3KLpbs1EZxi8ZWPnvyKSVN6m1azdpVg=
+github.com/Bios-Marcel/tview v0.0.0-20191010190327-42c5245b3d25/go.mod h1:AtXfMotMUyN+IQ7JwQyvrWr9dQN+TNRlq+slKB0fmQc=
 github.com/DATA-DOG/go-sqlmock v1.3.3 h1:CWUqKXe0s8A2z6qCgkP4Kru7wC11YoAnoupUKFDnH08=
 github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
diff --git a/ui/chatview.go b/ui/chatview.go
index c7ebfbaf..ce9217de 100644
--- a/ui/chatview.go
+++ b/ui/chatview.go
@@ -174,6 +174,7 @@ func NewChatView(state *discordgo.State, ownUserID string) *ChatView {
 		SetDynamicColors(true).
 		SetRegions(true).
 		SetWordWrap(true).
+		SetIndicateOverflow(true).
 		SetBorder(true).
 		SetTitleColor(config.GetTheme().InverseTextColor)
 
diff --git a/ui/commandview.go b/ui/commandview.go
index 2e6f35a2..f21d8c42 100644
--- a/ui/commandview.go
+++ b/ui/commandview.go
@@ -38,7 +38,8 @@ func NewCommandView(onExecuteCommand func(command string)) *CommandView {
 	commandInput := NewEditor()
 	commandInput.internalTextView.
 		SetWrap(false).
-		SetWordWrap(false)
+		SetWordWrap(false).
+		SetIndicateOverflow(true)
 
 	cmdView := &CommandView{
 		commandOutput: commandOutput,