diff --git a/src/logic-scenes/board/card-board.gd b/src/logic-scenes/board/card-board.gd
index 3c02e0f..1eaee18 100644
--- a/src/logic-scenes/board/card-board.gd
+++ b/src/logic-scenes/board/card-board.gd
@@ -272,11 +272,19 @@ func _input(event):
                 selected_card_for_assignment += 1
                 
     elif event.is_action_pressed("ui_left"):        # left to switch context to the left
+        if active_context == ui_context.ASSIGN_POST_IT:
+            _return_postit_to_panels(currently_selected_node)
+            _leave_assignment_context()
+        
         active_context -= 1
         if active_context <= -1:
             active_context = ui_context.POST_IT_LIST
             
     elif event.is_action_pressed("ui_right"):       # right to switch context to the right
+        if active_context == ui_context.ASSIGN_POST_IT:
+            _return_postit_to_panels(currently_selected_node)
+            _leave_assignment_context()
+
         active_context += 1
         if active_context > 1:
             active_context = ui_context.DROPZONE