diff --git a/SafeExamBrowser.Proctoring/ProctoringController.cs b/SafeExamBrowser.Proctoring/ProctoringController.cs
index f9ba3953..1842cf47 100644
--- a/SafeExamBrowser.Proctoring/ProctoringController.cs
+++ b/SafeExamBrowser.Proctoring/ProctoringController.cs
@@ -9,6 +9,7 @@
 using System;
 using System.IO;
 using System.Reflection;
+using System.Threading;
 using System.Windows;
 using Microsoft.Web.WebView2.Wpf;
 using SafeExamBrowser.Configuration.Contracts;
@@ -223,6 +224,8 @@ namespace SafeExamBrowser.Proctoring
 						control.ExecuteScriptAsync("ZoomMtg.leaveMeeting({});");
 					}
 
+					Thread.Sleep(2000);
+
 					window.Close();
 					control = default(ProctoringControl);
 					window = default(IProctoringWindow);
diff --git a/SafeExamBrowser.Proctoring/Zoom/index.html b/SafeExamBrowser.Proctoring/Zoom/index.html
index f4cb08bd..091b200a 100644
--- a/SafeExamBrowser.Proctoring/Zoom/index.html
+++ b/SafeExamBrowser.Proctoring/Zoom/index.html
@@ -14,8 +14,6 @@
         <script src="https://source.zoom.us/zoom-meeting-1.9.1.min.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.9/crypto-js.min.js"></script>
         <script type="text/javascript">
-            const ATTENDEE = 0;
-
             var audioJoin = 0;
             var videoJoin = 0;
 
@@ -24,11 +22,12 @@
                 var audioContainer = document.getElementsByClassName('join-audio-container')[0];
                 var leave = document.getElementsByClassName('footer__leave-btn-container')[0];
                 var more = document.getElementsByClassName('more-button')[0];
+                var participantControls = document.getElementsByClassName('participants-item__buttons')[0];
                 var raiseHandContainer = document.getElementsByClassName('participants-section-container__participants-footer')[0];
                 var videoButton = document.getElementsByClassName('send-video-container__btn')[0];
                 var videoContainer = document.getElementsByClassName('send-video-container')[0];
 
-                if (audioButton && !'%_AUDIO_MUTED_%' && audioJoin < 100) {
+                if (audioButton && !'%_AUDIO_MUTED_%' && audioJoin < 500) {
                     audioButton.click();
                     audioJoin++;
                 }
@@ -45,11 +44,15 @@
                     more.style.visibility = 'hidden';
                 }
 
+                if (participantControls) {
+                    participantControls.style.visibility = 'hidden';
+                }
+
                 if (raiseHandContainer && !'%_ALLOW_RAISE_HAND_%') {
                     raiseHandContainer.style.visibility = 'hidden';
                 }
 
-                if (videoButton && !'%_VIDEO_MUTED_%' && videoJoin < 100) {
+                if (videoButton && !'%_VIDEO_MUTED_%' && videoJoin < 500) {
                     videoButton.click();
                     videoJoin++;
                 }
@@ -62,6 +65,7 @@
             }
 
             function startMeeting(credentials) {
+                const ATTENDEE = 0;
                 var signature = credentials.signature;
 
                 if (!ZoomMtg.checkSystemRequirements()) {
diff --git a/SafeExamBrowser.UserInterface.Desktop/Windows/ProctoringWindow.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/ProctoringWindow.xaml.cs
index 7892d226..0b08cf2c 100644
--- a/SafeExamBrowser.UserInterface.Desktop/Windows/ProctoringWindow.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Desktop/Windows/ProctoringWindow.xaml.cs
@@ -63,7 +63,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
 		public void HideWithDelay()
 		{
 			Dispatcher.Invoke(() => this.MoveToBackground());
-			Task.Delay(10000).ContinueWith(_ => Hide());
+			Task.Delay(15000).ContinueWith(_ => Hide());
 		}
 
 		public void SetTitle(string title)
diff --git a/SafeExamBrowser.UserInterface.Mobile/Windows/ProctoringWindow.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Windows/ProctoringWindow.xaml.cs
index 92a39782..a3d993ef 100644
--- a/SafeExamBrowser.UserInterface.Mobile/Windows/ProctoringWindow.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Mobile/Windows/ProctoringWindow.xaml.cs
@@ -63,7 +63,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
 		public void HideWithDelay()
 		{
 			Dispatcher.Invoke(() => this.MoveToBackground());
-			Task.Delay(10000).ContinueWith(_ => Hide());
+			Task.Delay(15000).ContinueWith(_ => Hide());
 		}
 
 		public void SetTitle(string title)