diff --git a/src/main/java/GUI/GUI.java b/src/main/java/GUI/GUI.java
index 4d4d07a..27fd50e 100644
--- a/src/main/java/GUI/GUI.java
+++ b/src/main/java/GUI/GUI.java
@@ -52,7 +52,7 @@ public class GUI extends JFrame implements ActionListener {
         setIconImage(img.getImage());
         this.renderMenu();
 
-        new Agenda(agendaPanel, this.currentPage, this.currentCompetition);
+        agenda = new Agenda(agendaPanel, this.currentPage, this.currentCompetition);
         previousButton.addActionListener(this);
         nextButton.addActionListener(this);
         HCButton.addActionListener(this);
diff --git a/src/main/java/GUI/ProjectionHandler.java b/src/main/java/GUI/ProjectionHandler.java
index afe3b15..7e0e48d 100644
--- a/src/main/java/GUI/ProjectionHandler.java
+++ b/src/main/java/GUI/ProjectionHandler.java
@@ -48,10 +48,15 @@ public class ProjectionHandler extends JDialog {
         this.agenda = agenda;
         try {
             competitionComboBox.getModel().setSelectedItem(agenda.getCompetition());
-        } catch (NotFoundInTable ignored) {
+        } catch (NotFoundInTable ignored) {}
+        if (agenda.getDate() != null || agenda.getSlot() != null) {
+            updateMovies();
+            updateDates();
+            dayComboBox.getModel().setSelectedItem(agenda.getDate());
+            updateSlots();
+            slotComboBox.getModel().setSelectedItem(agenda.getSlot());
+            updateRooms();
         }
-        dayComboBox.getModel().setSelectedItem(agenda.getDate());
-        slotComboBox.getModel().setSelectedItem(agenda.getSlot());
         createUIComponents();
     }