diff --git a/terminis/pytetris/core.py b/terminis/pytetris/core.py
index 82591d4..d7886e2 100644
--- a/terminis/pytetris/core.py
+++ b/terminis/pytetris/core.py
@@ -205,7 +205,7 @@ class Tetris:
 
     def hold_piece(self):
         if self.current_piece.hold_enabled:
-            self.current_piece, self.hold_piece = self.held_piece, self.current_piece
+            self.current_piece, self.held_piece = self.held_piece, self.current_piece
             self.held_piece.minoes_positions = self.held_piece.MINOES_POSITIONS
             self.held_piece.hold_enabled = False
             self.new_piece()
diff --git a/terminis/terminis.py b/terminis/terminis.py
index c960ea3..fc5c00c 100644
--- a/terminis/terminis.py
+++ b/terminis/terminis.py
@@ -286,6 +286,7 @@ class ControlsWindow(Window, ControlsParser):
         ControlsParser.__init__(self)
         self.read(self.FILE_PATH)
         Window.__init__(self, game, width, height, begin_x, begin_y)
+        self.refresh()
         for action, key in self.items(self.SECTION):
             if key == "SPACE":
                 self[action] = " "
@@ -395,7 +396,6 @@ class Game(Tetris):
         self.hold_window.refresh()
         self.next_window.refresh()
         self.stats_window.refresh()
-        self.controls_window.refresh()
         
         scheduler.repeat("time", 1, self.stats_window.refresh_time)
         scheduler.repeat("input", self.AUTOSHIFT_DELAY, self.process_input)