diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php
index 8598ef88..ee20a7b3 100644
--- a/site/plugins/admin/app/Controllers/EntriesController.php
+++ b/site/plugins/admin/app/Controllers/EntriesController.php
@@ -283,7 +283,12 @@ class EntriesController extends Controller
             $this->flash->addMessage('error', __('admin_message_entry_was_not_created'));
         }
 
-        return $response->withRedirect($this->router->pathFor('admin.entries.index') . '?id=' . $parent_entry_id);
+        if (isset($data['create-and-edit'])) {
+            return $response->withRedirect($this->router->pathFor('admin.entries.edit') . '?id=' . $data['id'] . '&type=editor');
+        } else {
+            return $response->withRedirect($this->router->pathFor('admin.entries.index') . '?id=' . $parent_entry_id);
+        }
+
     }
 
     /**
diff --git a/site/plugins/admin/lang/en_US.yaml b/site/plugins/admin/lang/en_US.yaml
index 722f7940..1459fabe 100755
--- a/site/plugins/admin/lang/en_US.yaml
+++ b/site/plugins/admin/lang/en_US.yaml
@@ -306,3 +306,4 @@ admin_help_text_for_entry_label: "Entry title."
 admin_help_text_for_entry_name: "Entry unique name in lowercase chars only."
 admin_help_text_for_entry_type: "Entry type based on Fieldset."
 admin_message_fieldset_not_found: "Fieldset not found"
+admin_create_and_edit: "Create & Edit"
diff --git a/site/plugins/admin/views/templates/content/entries/add.html b/site/plugins/admin/views/templates/content/entries/add.html
index c6008e2c..600cdba6 100644
--- a/site/plugins/admin/views/templates/content/entries/add.html
+++ b/site/plugins/admin/views/templates/content/entries/add.html
@@ -39,7 +39,16 @@
                 </div>
             </div>
             <div class="form-group">
-                <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="btn btn-black">
+
+            <div class="btn-group custom-btn-group">
+              <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="btn btn-black">
+              <button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <span class="sr-only">Toggle Dropdown</span>
+              </button>
+              <div class="dropdown-menu">
+                <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown-item">
+              </div>
+            </div>
             </div>
         </div>
     </div>