diff --git a/src/apps/terminal/TermView.cpp b/src/apps/terminal/TermView.cpp
index f06ab5f6db..8267c802bf 100644
--- a/src/apps/terminal/TermView.cpp
+++ b/src/apps/terminal/TermView.cpp
@@ -1215,6 +1215,8 @@ TermView::DetachedFromWindow()
 {
 	be_clipboard->StopWatching(BMessenger(this));
 
+	 _NextState(fDefaultState);
+
 	delete fWinchRunner;
 	fWinchRunner = NULL;