diff --git a/resources/views/proposals/edit.blade.php b/resources/views/proposals/edit.blade.php
index e89ea085698b..d06c82ef8d0a 100644
--- a/resources/views/proposals/edit.blade.php
+++ b/resources/views/proposals/edit.blade.php
@@ -12,7 +12,7 @@
 
     {!! Former::open($url)
             ->method($method)
-            ->id('mainForm')
+            ->onsubmit('return onFormSubmit(event)')
             ->rules([
                 'invoice_id' => 'required',
             ]) !!}
@@ -57,7 +57,7 @@
                 ->asLinkTo(HTMLUtils::previousUrl('/proposals')) !!}
 
         {!! Button::success(trans("texts.save"))
-                ->withAttributes(array('id' => 'saveButton', 'onclick' => 'onSaveClick()'))
+                ->submit()
                 ->appendIcon(Icon::create('floppy-disk')) !!}
     </center>
 
@@ -72,10 +72,11 @@
     var templates = {!! $templates !!};
     var templateMap = {};
 
-    function onSaveClick() {
+    function onFormSubmit() {
         $('#html').val(grapesjsEditor.getHtml());
         $('#css').val(grapesjsEditor.getCss());
-        $('#mainForm').submit();
+
+        return true;
     }
 
     function loadTemplate() {
diff --git a/resources/views/proposals/snippets/edit.blade.php b/resources/views/proposals/snippets/edit.blade.php
index 5769b5c54a76..5147230a2b4e 100644
--- a/resources/views/proposals/snippets/edit.blade.php
+++ b/resources/views/proposals/snippets/edit.blade.php
@@ -11,7 +11,7 @@
 
     {!! Former::open($url)
             ->method($method)
-            ->id('mainForm')
+            ->onsubmit('return onFormSubmit(event)')
             ->rules([
                 'name' => 'required',
             ]) !!}
@@ -26,7 +26,6 @@
         {!! Former::text('css') !!}
     </span>
 
-
     <div class="row">
 		<div class="col-lg-12">
             <div class="panel panel-default">
@@ -60,7 +59,7 @@
                 ->asLinkTo(HTMLUtils::previousUrl('/proposals')) !!}
 
         {!! Button::success(trans("texts.save"))
-                ->withAttributes(array('id' => 'saveButton', 'onclick' => 'onSaveClick()'))
+                ->submit()
                 ->appendIcon(Icon::create('floppy-disk')) !!}
     </center>
 
@@ -73,10 +72,11 @@
     var categories = {!! $categories !!};
     var categoryMap = {};
 
-    function onSaveClick() {
+    function onFormSubmit() {
         $('#html').val(grapesjsEditor.getHtml());
         $('#css').val(grapesjsEditor.getCss());
-        $('#mainForm').submit();
+
+        return true;
     }
 
     $(function() {
diff --git a/resources/views/proposals/templates/edit.blade.php b/resources/views/proposals/templates/edit.blade.php
index e8db9577bc08..6dc14065dfd6 100644
--- a/resources/views/proposals/templates/edit.blade.php
+++ b/resources/views/proposals/templates/edit.blade.php
@@ -11,7 +11,7 @@
 
     {!! Former::open($url)
             ->method($method)
-            ->id('mainForm')
+            ->onsubmit('return onFormSubmit(event)')
             ->rules([
                 'name' => 'required',
             ]) !!}
@@ -26,7 +26,6 @@
         {!! Former::text('css') !!}
     </span>
 
-
     <div class="row">
 		<div class="col-lg-12">
             <div class="panel panel-default">
@@ -57,9 +56,15 @@
                 ->appendIcon(Icon::create('remove-circle'))
                 ->asLinkTo(HTMLUtils::previousUrl('/proposals')) !!}
 
-        {!! Button::success(trans("texts.save"))
-                ->withAttributes(array('id' => 'saveButton', 'onclick' => 'onSaveClick()'))
+        {!! Button::success(trans('texts.save'))
+                ->submit()
                 ->appendIcon(Icon::create('floppy-disk')) !!}
+
+        @if ($template)
+            {!! Button::primary(trans('texts.new_proposal'))
+                    ->asLinkTo(url('/proposals/create/0/' . $template->public_id)) !!}
+        @endif
+
     </center>
 
     {!! Former::close() !!}
@@ -70,10 +75,11 @@
     var templates = {!! $templates !!};
     var templateMap = {};
 
-    function onSaveClick() {
+    function onFormSubmit() {
         $('#html').val(grapesjsEditor.getHtml());
         $('#css').val(grapesjsEditor.getCss());
-        $('#mainForm').submit();
+
+        return true;
     }
 
     $(function() {