diff --git a/MatterControlApplication.cs b/MatterControlApplication.cs
index 324fa7567..63b11d825 100644
--- a/MatterControlApplication.cs
+++ b/MatterControlApplication.cs
@@ -600,8 +600,9 @@ namespace MatterHackers.MatterControl
 			base.OnClosed(e);
 		}
 
-		public override void OnClosing(out bool CancelClose)
+		public override void OnClosing(out bool cancelClose)
 		{
+			cancelClose = false;
 			// save the last size of the window so we can restore it next time.
 			ApplicationSettings.Instance.set(ApplicationSettingsKey.MainWindowMaximized, this.Maximized.ToString().ToLower());
 
@@ -614,8 +615,20 @@ namespace MatterHackers.MatterControl
 			//Save a snapshot of the prints in queue
 			QueueData.Instance.SaveDefaultQueue();
 
-			if (!closeHasBeenConfirmed && PrinterConnectionAndCommunication.Instance.PrinterIsPrinting)
+			// If we are waiting for a response and get another request, just cancel the close until we get a response.
+			if(closeMessageBoxIsOpen)
 			{
+				cancelClose = true;
+			}
+
+			if (!closeHasBeenConfirmed 
+				&& !closeMessageBoxIsOpen
+				&& PrinterConnectionAndCommunication.Instance.PrinterIsPrinting)
+			{
+				cancelClose = true;
+				// Record that we are waiting for a response to the request to close
+				closeMessageBoxIsOpen = true;
+
 				if (PrinterConnectionAndCommunication.Instance.CommunicationState != PrinterConnectionAndCommunication.CommunicationStates.PrintingFromSd)
 				{
 					// Needed as we can't assign to CancelClose inside of the lambda below
@@ -623,8 +636,6 @@ namespace MatterHackers.MatterControl
 						"Are you sure you want to abort the current print and close MatterControl?".Localize(),
 						"Abort Print".Localize(),
 						StyledMessageBox.MessageType.YES_NO);
-
-					CancelClose = true;
 				}
 				else
 				{
@@ -633,24 +644,25 @@ namespace MatterHackers.MatterControl
 						"Are you sure you want exit while a print is running from SD Card?\n\nNote: If you exit, it is recommended you wait until the print is completed before running MatterControl again.".Localize(),
 						"Exit while printing".Localize(),
 						StyledMessageBox.MessageType.YES_NO);
-
-					CancelClose = true;
 				}
 			}
 			else if (PartsSheet.IsSaving())
 			{
 				StyledMessageBox.ShowMessageBox(onConfirmExit, savePartsSheetExitAnywayMessage, confirmExit, StyledMessageBox.MessageType.YES_NO);
-				CancelClose = true;
+				cancelClose = true;
 			}
-			else
+			else if(!cancelClose) // only check if we have not already canceled
 			{
-				base.OnClosing(out CancelClose);
+				base.OnClosing(out cancelClose);
 			}
 		}
 
 		bool closeHasBeenConfirmed = false;
+		bool closeMessageBoxIsOpen = false;
 		private void ConditionalyCloseNow(bool continueWithShutdown)
 		{
+			// Response received, cecord that we are not waiting anymore.
+			closeMessageBoxIsOpen = false;
 			if (continueWithShutdown)
 			{
 				closeHasBeenConfirmed = true;