diff --git a/ghost/admin/app/styles/layouts/editor.css b/ghost/admin/app/styles/layouts/editor.css
index 8164b855f2..7fc891098d 100644
--- a/ghost/admin/app/styles/layouts/editor.css
+++ b/ghost/admin/app/styles/layouts/editor.css
@@ -180,9 +180,11 @@
     overflow-y: auto;
     padding: 10vw 4vw;
     width: 100%;
+    height: 100%;
 }
 
 .gh-editor-inner {
     margin: 0 auto;
     max-width: 700px;
+    height: 100%;
 }
diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index 3559ded171..84b0cf4662 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -83,7 +83,7 @@
     "emberx-file-input": "1.1.1",
     "eslint-plugin-ember-suave": "1.0.0",
     "fs-extra": "2.0.0",
-    "ghost-editor": "0.1.5",
+    "ghost-editor": "https://github.com/TryGhost/Ghost-Editor/tarball/dev-deps-test",
     "glob": "7.1.1",
     "grunt": "1.0.1",
     "grunt-bg-shell": "2.3.3",
diff --git a/ghost/admin/tests/helpers/module-for-acceptance.js b/ghost/admin/tests/helpers/module-for-acceptance.js
deleted file mode 100644
index ca70d776d3..0000000000
--- a/ghost/admin/tests/helpers/module-for-acceptance.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import {module} from 'qunit';
-import RSVP from 'rsvp';
-import startApp from '../helpers/start-app';
-import destroyApp from '../helpers/destroy-app';
-
-const {Promise} = RSVP;
-
-export default function (name, options = {}) {
-    module(name, {
-        beforeEach() {
-            this.application = startApp();
-
-            if (options.beforeEach) {
-                return options.beforeEach(...arguments);
-            }
-        },
-
-        afterEach() {
-            let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
-            return Promise.resolve(afterEach).then(() => destroyApp(this.application));
-        }
-    });
-}
diff --git a/ghost/admin/yarn.lock b/ghost/admin/yarn.lock
index 824c2cdaf4..b2dfb32d0b 100644
--- a/ghost/admin/yarn.lock
+++ b/ghost/admin/yarn.lock
@@ -3327,15 +3327,15 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-ghost-editor@0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/ghost-editor/-/ghost-editor-0.1.5.tgz#51bafd71c94bee3b6f15c9baa69b54115435092a"
+"ghost-editor@https://github.com/TryGhost/Ghost-Editor/tarball/dev-deps-test":
+  version "0.1.6"
+  resolved "https://github.com/TryGhost/Ghost-Editor/tarball/dev-deps-test#75a3cf508276bb560b1419a45d76b62ec4d8adad"
   dependencies:
     broccoli-funnel "^1.0.7"
     broccoli-merge-trees "^1.1.4"
     ember-cli-babel "^5.1.6"
     ember-cli-htmlbars "^1.1.0"
-    mobiledoc-kit "^0.10.11"
+    mobiledoc-kit "^0.10.13"
     showdown-ghost "^0.4.0"
 
 git-repo-info@^1.0.4, git-repo-info@^1.1.2:
@@ -4757,7 +4757,7 @@ mobiledoc-html-renderer@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/mobiledoc-html-renderer/-/mobiledoc-html-renderer-0.3.1.tgz#a411181015c40be26d716d82824691a63fa8ba88"
 
-mobiledoc-kit@^0.10.11:
+mobiledoc-kit@^0.10.13:
   version "0.10.13"
   resolved "https://registry.yarnpkg.com/mobiledoc-kit/-/mobiledoc-kit-0.10.13.tgz#53877edc83f84b2df0bf048f6432ee59a0216b6a"
   dependencies: