diff --git a/Frontend/lib/mih_apis/mih_mzansi_calendar_apis.dart b/Frontend/lib/mih_apis/mih_mzansi_calendar_apis.dart
index d71d4e04..e78ec36d 100644
--- a/Frontend/lib/mih_apis/mih_mzansi_calendar_apis.dart
+++ b/Frontend/lib/mih_apis/mih_mzansi_calendar_apis.dart
@@ -263,7 +263,7 @@ class MihMzansiCalendarApis {
       }),
     );
     if (response.statusCode == 201) {
-      Navigator.pop(context);
+      // Navigator.pop(context);
       Navigator.pop(context);
       Navigator.pop(context);
       Navigator.pop(context);
diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/app_tools/waiting_room.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/app_tools/waiting_room.dart
index f5a99ba0..95afc6db 100644
--- a/Frontend/lib/mih_packages/patient_profile/pat_manager/app_tools/waiting_room.dart
+++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/app_tools/waiting_room.dart
@@ -241,6 +241,7 @@ class _WaitingRoomState extends State<WaitingRoom> {
               height: 50,
               child: MIHButton(
                 onTap: () {
+                  Navigator.pop(context);
                   addAppointmentWindow();
                 },
                 buttonText: "Skeleton Appointment",