diff --git a/src/canvas/model/Canvas.js b/src/canvas/model/Canvas.js
index dc89cc7b0..5f9dde86c 100644
--- a/src/canvas/model/Canvas.js
+++ b/src/canvas/model/Canvas.js
@@ -29,7 +29,7 @@ export default Backbone.Model.extend({
   updateDevice() {
     const { em } = this;
     const device = em.getDeviceModel();
-    const { model } = em.get('currentFrame') || {};
+    const model = em.getCurrentFrameModel();
 
     if (model && device) {
       const { width, height } = device.attributes;
diff --git a/src/canvas/view/CanvasView.js b/src/canvas/view/CanvasView.js
index 50f443f00..0fdc3f518 100644
--- a/src/canvas/view/CanvasView.js
+++ b/src/canvas/view/CanvasView.js
@@ -559,6 +559,7 @@ export default Backbone.View.extend({
     frms.listenToLoad();
     frms.on('loaded:all', () => em.trigger('loaded'));
     frames.render();
+    em.setCurrentFrame(frms.at(0).view);
     $frames.append(frames.el);
     this.frame = frms.at(0).view;
 
diff --git a/src/editor/model/Editor.js b/src/editor/model/Editor.js
index 3fe4ba346..ac63496fb 100644
--- a/src/editor/model/Editor.js
+++ b/src/editor/model/Editor.js
@@ -636,6 +636,10 @@ export default Backbone.Model.extend({
     return this.get('DomComponents').getWrapper();
   },
 
+  setCurrentFrame(frameView) {
+    return this.set('currentFrame', frameView);
+  },
+
   getCurrentFrame() {
     return this.get('currentFrame');
   },