2 files changed, 5 insertions, 0 deletions
diff --git a/matrix/matrix.go b/matrix/matrix.go
index c89f884..43141b0 100644
--- a/matrix/matrix.go
+++ b/matrix/matrix.go
@@ -261,6 +261,7 @@ func (c *Container) Stop() {
 		if err != nil {
 			debug.Print("Error closing history manager:", err)
 		}
+		c.history = nil
 	}
 }
 
diff --git a/ui/ui.go b/ui/ui.go
index 858e407..c22a154 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -105,6 +105,10 @@ func (ui *GomuksUI) SetView(name View) {
 	if ok {
 		focusable.Focus()
 	}
+	if ui.app.Screen() != nil {
+		ui.app.Screen().Clear()
+		ui.Render()
+	}
 }
 
 func (ui *GomuksUI) MainView() ifc.MainView {