diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index f41d0634df..7eac5e9f87 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2311,14 +2311,21 @@ void LLViewerWindow::shutdownViews()
 		gMorphView->setVisible(FALSE);
 	}
 	LL_INFOS() << "Global views cleaned." << LL_ENDL ;
-	
-	LLNotificationsUI::LLToast::cleanupToasts();
-	LL_INFOS() << "Leftover toast cleaned up." << LL_ENDL;
+
+	// <FS:Ansariel> FIRE-17513: Need to shutdown modals first because toasts are derived from LLModalDialog
+	//LLNotificationsUI::LLToast::cleanupToasts();
+	//LL_INFOS() << "Leftover toast cleaned up." << LL_ENDL;
+	// </FS:Ansariel>
 
 	// DEV-40930: Clear sModalStack. Otherwise, any LLModalDialog left open
 	// will crump with LL_ERRS.
 	LLModalDialog::shutdownModals();
 	LL_INFOS() << "LLModalDialog shut down." << LL_ENDL; 
+	
+	// <FS:Ansariel> FIRE-17513: Need to shutdown modals first because toasts are derived from LLModalDialog
+	LLNotificationsUI::LLToast::cleanupToasts();
+	LL_INFOS() << "Leftover toast cleaned up." << LL_ENDL;
+	// </FS:Ansariel>
 
 	// destroy the nav bar, not currently part of gViewerWindow
 	// *TODO: Make LLNavigationBar part of gViewerWindow