diff --git a/remoting/webapp/base/html/main.css b/remoting/webapp/base/html/main.css
index a9df6ec2841d..c4823c6271d7 100644
--- a/remoting/webapp/base/html/main.css
+++ b/remoting/webapp/base/html/main.css
@@ -703,7 +703,7 @@ html.apps-v2.scrollable {
  * no scroll-bars, so the advantages of flex-box layout to achieve centering
  * (ie, the DOM is easier to measure to determine when scroll-bars are needed)
  * don't apply */
-.full-screen #session-mode {
+.fullscreen #session-mode {
   position: fixed;
   top: 0;
   left: 0;
diff --git a/remoting/webapp/crd/js/client_session.js b/remoting/webapp/crd/js/client_session.js
index 6c46ebdd160f..5be8029a6431 100644
--- a/remoting/webapp/crd/js/client_session.js
+++ b/remoting/webapp/crd/js/client_session.js
@@ -1302,13 +1302,7 @@ remoting.ClientSession.prototype.requestPairing = function(clientName, onDone) {
  * @private
  */
 remoting.ClientSession.prototype.onFullScreenChanged_ = function (fullscreen) {
-  var htmlNode = /** @type {HTMLElement} */ (document.documentElement);
   this.enableBumpScroll_(fullscreen);
-  if (fullscreen) {
-    htmlNode.classList.add('full-screen');
-  } else {
-    htmlNode.classList.remove('full-screen');
-  }
 };
 
 /**
diff --git a/remoting/webapp/crd/js/fullscreen_v1.js b/remoting/webapp/crd/js/fullscreen_v1.js
index 5935e3555433..a68a77bc27cb 100644
--- a/remoting/webapp/crd/js/fullscreen_v1.js
+++ b/remoting/webapp/crd/js/fullscreen_v1.js
@@ -87,6 +87,11 @@ remoting.FullscreenAppsV1.prototype.onFullscreenChanged_ = function() {
   window.setTimeout(
       /** @this {remoting.FullscreenAppsV1} */
       function() {
+        if (this.isActive()) {
+          document.body.classList.add('fullscreen');
+        } else {
+          document.body.classList.remove('fullscreen');
+        }
         this.eventSource_.raiseEvent(this.kEventName_, this.isActive());
       }.bind(this),
       500);