diff --git a/resources/views/proposals/edit.blade.php b/resources/views/proposals/edit.blade.php
index a67630d9bd76..ac4ea1f9d730 100644
--- a/resources/views/proposals/edit.blade.php
+++ b/resources/views/proposals/edit.blade.php
@@ -13,6 +13,7 @@
     {!! Former::open($url)
             ->method($method)
             ->onsubmit('return onFormSubmit(event)')
+            ->addClass('warn-on-exit')
             ->rules([
                 'invoice_id' => 'required',
             ]) !!}
diff --git a/resources/views/proposals/grapesjs.blade.php b/resources/views/proposals/grapesjs.blade.php
index d6d558452637..9d68f831213e 100644
--- a/resources/views/proposals/grapesjs.blade.php
+++ b/resources/views/proposals/grapesjs.blade.php
@@ -40,6 +40,10 @@ $(function() {
         }
     @endif
 
+    grapesjsEditor.on('component:update', function(a, b) {
+        NINJA.formIsChanged = true;
+    });
+
 });
 
 </script>
diff --git a/resources/views/proposals/grapesjs_header.blade.php b/resources/views/proposals/grapesjs_header.blade.php
index ff88a5c4810e..34415333798f 100644
--- a/resources/views/proposals/grapesjs_header.blade.php
+++ b/resources/views/proposals/grapesjs_header.blade.php
@@ -2,16 +2,29 @@
 <link href="{{ asset('css/grapesjs.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/>
 
 <style>
+
 .gjs-four-color,
 .gjs-four-color-h:hover {
     color: #3b97ff !important;
 }
+
 .gjs-rte-actionbar,
 .gjs-block-label,
 .gjs-block-categories {
     font-size: 12px !important;
 }
+
 .gjs-toolbar-item {
     font-size: 2em !important;
 }
+
+#gjs-clm-status-c {
+    display: none !important;
+}
+
+/* Workaround for https://github.com/artf/grapesjs/issues/596 */
+.sp-container.sp-light {
+    left: 300px !important;
+}
+
 </style>
diff --git a/resources/views/proposals/snippets/edit.blade.php b/resources/views/proposals/snippets/edit.blade.php
index 196292b527fe..e03435eeb3d4 100644
--- a/resources/views/proposals/snippets/edit.blade.php
+++ b/resources/views/proposals/snippets/edit.blade.php
@@ -18,6 +18,7 @@
     {!! Former::open($url)
             ->method($method)
             ->onsubmit('return onFormSubmit(event)')
+            ->addClass('warn-on-exit')
             ->rules([
                 'name' => 'required',
             ]) !!}
diff --git a/resources/views/proposals/templates/edit.blade.php b/resources/views/proposals/templates/edit.blade.php
index 2202a5cd2510..8412c79dec5d 100644
--- a/resources/views/proposals/templates/edit.blade.php
+++ b/resources/views/proposals/templates/edit.blade.php
@@ -12,6 +12,7 @@
     {!! Former::open($url)
             ->method($method)
             ->onsubmit('return onFormSubmit(event)')
+            ->addClass('warn-on-exit')
             ->rules([
                 'name' => 'required',
             ]) !!}