diff --git a/rc.lua b/rc.lua
index 9bdb5bc..c88278d 100644
--- a/rc.lua
+++ b/rc.lua
@@ -335,10 +335,10 @@ for s = 1, screen.count() do
 	local left_layout = wibox.layout.fixed.horizontal()
 	local right_layout = wibox.layout.fixed.horizontal()
 	if s == 1 then
-		left_layout:add(mytextbox)
 		right_layout:add(mypromptbox[s])
 		right_layout:add(mytaglist[s])
 		if screen.count() == 1 then
+			right_layout:add(mytextbox)
 			right_layout:add(wibox.widget.systray())
 			right_layout:add(mytextclock)
 		end
@@ -348,6 +348,7 @@ for s = 1, screen.count() do
 		left_layout:add(mytextclock)
 		left_layout:add(wibox.widget.systray())
 		left_layout:add(mytaglist[s])
+		left_layout:add(mytextbox)
 		left_layout:add(mypromptbox[s])
 	else
 		left_layout:add(mytaglist[s])
diff --git a/tmux.conf b/tmux.conf
index b300961..bcb8594 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -42,6 +42,8 @@ set -g status-left-length 20
 set -g status-right-length 40
 set -g monitor-activity on
 set -g terminal-overrides "rxvt-unicode*:sitm@,ritm@"
+set -g set-titles on
+set -g set-titles-string '#h'
 
 set -g status-position top
 set -g status-bg "colour8"