diff --git a/core/modules/responsive_preview/js/responsive-preview.js b/core/modules/responsive_preview/js/responsive-preview.js
index 5bc4853..89e77de 100644
--- a/core/modules/responsive_preview/js/responsive-preview.js
+++ b/core/modules/responsive_preview/js/responsive-preview.js
@@ -123,7 +123,7 @@ Drupal.behaviors.responsivePreview = {
         });
 
       // Allow other scripts to respond to responsive preview mode changes.
-      tabModel.on('change:isActive', function (model, isActive) {
+      previewModel.on('change:isActive', function (model, isActive) {
         $(document).trigger((isActive) ? 'drupalResponsivePreviewStarted' : 'drupalResponsivePreviewStopped');
       });
 
@@ -292,8 +292,11 @@ Drupal.responsivePreview = Drupal.responsivePreview || {
     /**
      * {@inheritdoc}
      */
-    initialize: function () {
-      this.envModel = this.options.envModel;
+    initialize: function (options) {
+      this.envModel = options.envModel;
+      this.gutter = options.gutter;
+      this.bleed = options.bleed;
+      this.strings = options.strings;
       // Listen to changes on the previewModel.
       this.model.on('change:isActive', this.render, this);
     },
@@ -312,10 +315,10 @@ Drupal.responsivePreview = Drupal.responsivePreview || {
           model: this.model,
           envModel: this.envModel,
           // Gutter size around preview frame.
-          gutter: this.options.gutter,
+          gutter: this.gutter,
           // Preview device frame width.
-          bleed: this.options.bleed,
-          strings: this.options.strings
+          bleed: this.bleed,
+          strings: this.strings
         });
         // Remove the inlined opacity style so that the CSS opacity transition
         // will fade in the preview view.
@@ -350,11 +353,11 @@ Drupal.responsivePreview = Drupal.responsivePreview || {
     /**
      * {@inheritdoc}
      */
-    initialize: function () {
-      this.gutter = this.options.gutter;
-      this.bleed = this.options.bleed;
-      this.tabModel = this.options.tabModel;
-      this.envModel = this.options.envModel;
+    initialize: function (options) {
+      this.gutter = options.gutter;
+      this.bleed = options.bleed;
+      this.tabModel = options.tabModel;
+      this.envModel = options.envModel;
       var handler;
 
       // Curry the 'this' object in order to pass it as an argument to the
@@ -455,10 +458,10 @@ Drupal.responsivePreview = Drupal.responsivePreview || {
     /**
      * {@inheritdoc}
      */
-    initialize: function () {
-      this.gutter = this.options.gutter;
-      this.bleed = this.options.bleed;
-      this.envModel = this.options.envModel;
+    initialize: function (options) {
+      this.gutter = options.gutter;
+      this.bleed = options.bleed;
+      this.envModel = options.envModel;
       var handler;
 
       // Curry the 'this' object in order to pass it as an argument to the
@@ -546,11 +549,11 @@ Drupal.responsivePreview = Drupal.responsivePreview || {
     /**
      * {@inheritdoc}
      */
-    initialize: function () {
-      this.gutter = this.options.gutter;
-      this.bleed = this.options.bleed;
-      this.strings = this.options.strings;
-      this.envModel = this.options.envModel;
+    initialize: function (options) {
+      this.gutter = options.gutter;
+      this.bleed = options.bleed;
+      this.strings = options.strings;
+      this.envModel = options.envModel;
 
       this.model.on('change:isRotated change:isDetailsExpanded change:dimensions change:activeDevice', this.render, this);