diff --git a/app/Http/Controllers/DocumentController.php b/app/Http/Controllers/DocumentController.php
index 28a544cb3dc5..a84cd8ee7444 100644
--- a/app/Http/Controllers/DocumentController.php
+++ b/app/Http/Controllers/DocumentController.php
@@ -105,11 +105,20 @@ class DocumentController extends BaseController
                 'code' => 400,
             ], 400);
         } else {
-            return Response::json([
-                'error' => false,
-                'document' => $doc_array,
-                'code' => 200,
-            ], 200);
+            if ($request->grapesjs) {
+                $response = [
+                    'data' => [
+                        $result->getUrl()
+                    ]
+                ];
+            } else {
+                $response = [
+                    'error' => false,
+                    'document' => $doc_array,
+                    'code' => 200,
+                ];
+            }
+            return Response::json($response, 200);
         }
     }
 
diff --git a/app/Ninja/Repositories/DocumentRepository.php b/app/Ninja/Repositories/DocumentRepository.php
index 450d48f2b231..9c50ee88ff49 100644
--- a/app/Ninja/Repositories/DocumentRepository.php
+++ b/app/Ninja/Repositories/DocumentRepository.php
@@ -54,7 +54,11 @@ class DocumentRepository extends BaseRepository
 
     public function upload($data, &$doc_array = null)
     {
-        $uploaded = $data['file'];
+        if (! empty($data['files']) && is_array($data['files'])) {
+            $uploaded = $data['files'][0];
+        } else {
+            $uploaded = $data['file'];
+        }
         $extension = strtolower($uploaded->getClientOriginalExtension());
         if (empty(Document::$types[$extension]) && ! empty(Document::$extraExtensions[$extension])) {
             $documentType = Document::$extraExtensions[$extension];
diff --git a/resources/views/proposals/grapesjs.blade.php b/resources/views/proposals/grapesjs.blade.php
index 9d68f831213e..e4e18fa3904f 100644
--- a/resources/views/proposals/grapesjs.blade.php
+++ b/resources/views/proposals/grapesjs.blade.php
@@ -14,7 +14,19 @@ $(function() {
                 'categoryLabel': "{{ trans('texts.standard') }}"
             }
         },
-        storageManager: {type: 'none'},
+        storageManager: {
+            type: 'none'
+        },
+        assetManager: {
+            assets: [],
+            noAssets: 'no assets TODO',
+            upload: {!! json_encode(url('/documents')) !!},
+            uploadName: 'files',
+            params: {
+                '_token': '{{ Session::getToken() }}',
+                'grapesjs': true,
+            }
+        }
     });
 
     var blockManager = grapesjsEditor.BlockManager;
diff --git a/resources/views/proposals/grapesjs_header.blade.php b/resources/views/proposals/grapesjs_header.blade.php
index 34415333798f..a47e7a926e8d 100644
--- a/resources/views/proposals/grapesjs_header.blade.php
+++ b/resources/views/proposals/grapesjs_header.blade.php
@@ -14,6 +14,10 @@
     font-size: 12px !important;
 }
 
+.gjs-mdl-title {
+    font-size: 1em !important;
+}
+.gjs-mdl-dialog,
 .gjs-toolbar-item {
     font-size: 2em !important;
 }