--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -9709,23 +9709,17 @@ nsDocument::MozCancelFullScreen()
 {
   nsIDocument::MozCancelFullScreen();
   return NS_OK;
 }
 
 void
 nsIDocument::MozCancelFullScreen()
 {
-  // Only perform fullscreen changes if we're running in a webapp
-  // same-origin to the web app, or if we're in a user generated event
-  // handler.
-  if (NodePrincipal()->GetAppStatus() >= nsIPrincipal::APP_STATUS_INSTALLED ||
-      nsContentUtils::IsRequestFullScreenAllowed()) {
-    RestorePreviousFullScreenState();
-  }
+  RestorePreviousFullScreenState();
 }
 
 // Runnable to set window full-screen mode. Used as a script runner
 // to ensure we only call nsGlobalWindow::SetFullScreen() when it's safe to
 // run script. nsGlobalWindow::SetFullScreen() dispatches a synchronous event
 // (handled in chome code) which is unsafe to run if this is called in
 // Element::UnbindFromTree().
 class nsSetWindowFullScreen : public nsRunnable {

--- a/content/html/content/test/file_fullscreen-api.html
+++ b/content/html/content/test/file_fullscreen-api.html
@@ -185,24 +185,22 @@ function error2(event) {
   addFullscreenChangeContinuation("enter", enter5);
   sendMouseClick(button);
 }
 
 function enter5(event) {
   ok(document.mozFullScreen, "Moved to full-screen after mouse click");
   addFullscreenChangeContinuation("exit", exit5);
   document.mozCancelFullScreen();
-  ok(document.mozFullScreen, "Should still be in full-screen mode, because calling context isn't trusted.");
-  setRequireTrustedContext(false);
-  document.mozCancelFullScreen();
   ok(!document.mozFullScreen, "Should have left full-screen mode.");
 }
 
 function exit5(event) {
   ok(!document.mozFullScreen, "Should have left full-screen mode (last time).");
+  setRequireTrustedContext(false);
 
   SpecialPowers.setBoolPref("full-screen-api.enabled", false);
   is(document.mozFullScreenEnabled, false, "document.mozFullScreenEnabled should be false if full-screen-api.enabled is false");
 
   addFullscreenErrorContinuation(error3);
   fullScreenElement().mozRequestFullScreen();
 }