diff --git a/libs/ui/CountersSelector.lua b/libs/ui/CountersSelector.lua
index 98e9607..57a1398 100644
--- a/libs/ui/CountersSelector.lua
+++ b/libs/ui/CountersSelector.lua
@@ -261,6 +261,10 @@ local function CountersSelector(initialCountersMap, config)
   mainWin.clear()
   titleWin.clear()
 
+  -- TODO: better window management on clear
+  term.clear()
+  term.setCursorPos(1, 1)
+
   if forceExited then
     return nil
   end