diff --git a/pkg/gui/gui_driver.go b/pkg/gui/gui_driver.go
index af261b453..5db3d9d92 100644
--- a/pkg/gui/gui_driver.go
+++ b/pkg/gui/gui_driver.go
@@ -266,12 +266,12 @@ func (self *GuiDriver) TopViewInWindow(windowName string) *gocui.View {
 }
 
 func (self *GuiDriver) SetCaption(caption string) {
-	self.gui.setCaption(caption)
+	self.OnUIThreadAndWait(func() { self.gui.setCaption(caption) })
 	self.waitTillIdle()
 }
 
 func (self *GuiDriver) SetCaptionPrefix(prefix string) {
-	self.gui.setCaptionPrefix(prefix)
+	self.OnUIThreadAndWait(func() { self.gui.setCaptionPrefix(prefix) })
 	self.waitTillIdle()
 }