diff --git a/src/canvas/model/Frame.js b/src/canvas/model/Frame.js
index 5eae3b2b8..ff681f6d7 100644
--- a/src/canvas/model/Frame.js
+++ b/src/canvas/model/Frame.js
@@ -38,7 +38,7 @@ export default Backbone.Model.extend({
     }
   },
 
-  getComponents() {
+  getComponent() {
     return this.get('components');
   },
 
diff --git a/src/canvas/view/FrameView.js b/src/canvas/view/FrameView.js
index f8a6e7b91..8986ebb42 100644
--- a/src/canvas/view/FrameView.js
+++ b/src/canvas/view/FrameView.js
@@ -252,7 +252,7 @@ export default Backbone.View.extend({
 
   renderBody() {
     const { config, model, ppfx } = this;
-    const components = model.getComponents();
+    const components = model.getComponent();
     const styles = model.getStyles();
     const { em } = config;
     const doc = this.getDoc();
diff --git a/src/dom_components/index.js b/src/dom_components/index.js
index 1fe2818c2..3dd70903f 100644
--- a/src/dom_components/index.js
+++ b/src/dom_components/index.js
@@ -453,11 +453,14 @@ export default () => {
      * @private
      */
     getComponent() {
-      return this.em
-        .get('PageManager')
-        .getSelected()
-        .getMainFrame()
-        .getComponents();
+      return (
+        component ||
+        this.em
+          .get('PageManager')
+          .getSelected()
+          .getMainFrame()
+          .getComponent()
+      );
     },
 
     /**
diff --git a/src/utils/Droppable.js b/src/utils/Droppable.js
index 20bb0209c..3e0510603 100644
--- a/src/utils/Droppable.js
+++ b/src/utils/Droppable.js
@@ -13,7 +13,7 @@ export default class Droppable {
       em
         .get('Canvas')
         .getFrames()
-        .map(frame => frame.getComponents().getEl());
+        .map(frame => frame.getComponent().getEl());
     const els = Array.isArray(el) ? el : [el];
     this.el = el;
     this.counter = 0;
diff --git a/test/specs/pages/index.js b/test/specs/pages/index.js
index 901e4411c..11f2d9dca 100644
--- a/test/specs/pages/index.js
+++ b/test/specs/pages/index.js
@@ -61,6 +61,8 @@ describe('Pages', () => {
     expect(initCmpLen).toBe(1);
   });
 
+  //   describe.only('Enable page manager', () => {});
+
   describe.only('Init with pages', () => {
     let idPage1, idComp1, idComp2, comp1, comp2, initPages;
     const createCompDef = id => ({
@@ -98,7 +100,7 @@ describe('Pages', () => {
         }
       ];
       editor = new Editor({
-        pages: {
+        pageManager: {
           pages: initPages
         }
       });
@@ -120,7 +122,12 @@ describe('Pages', () => {
       expect(pages.length).toBe(initPages.length);
       pages.map(page => {
         expect(page.get('id')).toBeTruthy();
-        // expect(page.getMainFrame().getComponents().get('type')).toBe('wrapper');
+        expect(
+          page
+            .getMainFrame()
+            .getComponent()
+            .get('type')
+        ).toBe('wrapper');
       });
     });
     // test('Pages are created', () => {