diff --git a/go.mod b/go.mod
index 96825ef..1d50784 100644
--- a/go.mod
+++ b/go.mod
@@ -14,9 +14,10 @@ require (
 	github.com/mewkiz/pkg v0.0.0-20200411195739-f6b5e26764c3 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	gitlab.com/tslocum/cbind v0.1.1
-	gitlab.com/tslocum/cview v1.4.5-0.20200425133514-5bfb860744af
+	gitlab.com/tslocum/cview v1.4.6-0.20200428215940-66d27850585b
 	golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5 // indirect
 	golang.org/x/image v0.0.0-20200119044424-58c23975cae1 // indirect
 	golang.org/x/mobile v0.0.0-20200329125638-4c31acba0007 // indirect
+	golang.org/x/sys v0.0.0-20200428200454-593003d681fa // indirect
 	gopkg.in/yaml.v2 v2.2.8
 )
diff --git a/go.sum b/go.sum
index 7310bdb..1704e26 100644
--- a/go.sum
+++ b/go.sum
@@ -57,8 +57,8 @@ github.com/rivo/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 gitlab.com/tslocum/cbind v0.1.1 h1:JXXtxMWHgWLvoF+QkrvcNvOQ59juy7OE1RhT7hZfdt0=
 gitlab.com/tslocum/cbind v0.1.1/go.mod h1:rX7vkl0pUSg/yy427MmD1FZAf99S7WwpUlxF/qTpPqk=
-gitlab.com/tslocum/cview v1.4.5-0.20200425133514-5bfb860744af h1:KFu6xaqWD4qp3rmtMD5e312r1dhgbZSxvdFoRGrO8zI=
-gitlab.com/tslocum/cview v1.4.5-0.20200425133514-5bfb860744af/go.mod h1:85Ec3ByMemrI3tUK4Rpd8jcF3J7maOFHGwzlNnCrPVI=
+gitlab.com/tslocum/cview v1.4.6-0.20200428215940-66d27850585b h1:vUWH84j1UTgAj95bS8qdZPTuU/MZQNAAzTTFQLpp61U=
+gitlab.com/tslocum/cview v1.4.6-0.20200428215940-66d27850585b/go.mod h1:85Ec3ByMemrI3tUK4Rpd8jcF3J7maOFHGwzlNnCrPVI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -98,6 +98,8 @@ golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f h1:gWF768j/LaZugp8dyS4UwsslYCYz9XgFxvlgsn0n9H8=
 golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200428200454-593003d681fa h1:yMbJOvnfYkO1dSAviTu/ZguZWLBTXx4xE3LYrxUCCiA=
+golang.org/x/sys v0.0.0-20200428200454-593003d681fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
diff --git a/gui_list.go b/gui_list.go
index 417252d..50454d0 100644
--- a/gui_list.go
+++ b/gui_list.go
@@ -245,14 +245,29 @@ func focusUpdated() {
 	if queueFocused {
 		app.SetFocus(queueList)
 
-		mainList.SetSelectedBackgroundColor(tcell.ColorDimGray)
+		mainList.SetSelectedTextColor(tcell.ColorWhite)
+		queueList.SetSelectedTextColor(tcell.ColorBlack)
+
+		mainList.SetSelectedTextAttributes(tcell.AttrBold | tcell.AttrUnderline)
+		queueList.SetSelectedTextAttributes(0)
+
+		mainList.SetSelectedBackgroundColor(tcell.ColorBlack)
 		queueList.SetSelectedBackgroundColor(tcell.ColorWhite)
 	} else {
 		app.SetFocus(mainList)
 
+		mainList.SetSelectedTextColor(tcell.ColorBlack)
+		queueList.SetSelectedTextColor(tcell.ColorWhite)
+
+		mainList.SetSelectedTextAttributes(0)
+		queueList.SetSelectedTextAttributes(tcell.AttrBold | tcell.AttrUnderline)
+
 		mainList.SetSelectedBackgroundColor(tcell.ColorWhite)
-		queueList.SetSelectedBackgroundColor(tcell.ColorDimGray)
+		queueList.SetSelectedBackgroundColor(tcell.ColorBlack)
 	}
 
+	mainList.SetHighlightFullLine(!queueFocused)
+	queueList.SetHighlightFullLine(queueFocused)
+
 	go app.QueueUpdateDraw(updateLists)
 }