diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7d1fc6d3..3c69c8776 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 ### Fixed
 * Fixes server creation API endpoint not passing the provided `external_id` to the creation service.
 * Fixes a bug causing users to be un-editable on new installations once more than one user exists.
+* Fixes default order of buttons in certain parts of the panel that would default to 'Delete' rather than 'Save' when pressing enter.
 
 ### Added
 * Adds ability to modify the external ID for a server through the API.
diff --git a/resources/themes/pterodactyl/admin/databases/view.blade.php b/resources/themes/pterodactyl/admin/databases/view.blade.php
index db7db1c48..41a2d7901 100644
--- a/resources/themes/pterodactyl/admin/databases/view.blade.php
+++ b/resources/themes/pterodactyl/admin/databases/view.blade.php
@@ -79,8 +79,8 @@
                 </div>
                 <div class="box-footer">
                     {!! csrf_field() !!}
-                    <button name="_method" value="DELETE" class="btn btn-sm btn-danger pull-left muted muted-hover"><i class="fa fa-trash-o"></i></button>
                     <button name="_method" value="PATCH" class="btn btn-sm btn-primary pull-right">Save</button>
+                    <button name="_method" value="DELETE" class="btn btn-sm btn-danger pull-left muted muted-hover"><i class="fa fa-trash-o"></i></button>
                 </div>
             </div>
         </div>
diff --git a/resources/themes/pterodactyl/admin/eggs/variables.blade.php b/resources/themes/pterodactyl/admin/eggs/variables.blade.php
index bd18e05cf..40ee82c8b 100644
--- a/resources/themes/pterodactyl/admin/eggs/variables.blade.php
+++ b/resources/themes/pterodactyl/admin/eggs/variables.blade.php
@@ -86,8 +86,8 @@
                     </div>
                     <div class="box-footer">
                         {!! csrf_field() !!}
-                        <button class="btn btn-sm btn-danger pull-left muted muted-hover" data-action="delete" name="_method" value="DELETE" type="submit"><i class="fa fa-trash-o"></i></button>
                         <button class="btn btn-sm btn-primary pull-right" name="_method" value="PATCH" type="submit">Save</button>
+                        <button class="btn btn-sm btn-danger pull-left muted muted-hover" data-action="delete" name="_method" value="DELETE" type="submit"><i class="fa fa-trash-o"></i></button>
                     </div>
                 </form>
             </div>
diff --git a/resources/themes/pterodactyl/admin/eggs/view.blade.php b/resources/themes/pterodactyl/admin/eggs/view.blade.php
index 2e0fdcc83..c2f687799 100644
--- a/resources/themes/pterodactyl/admin/eggs/view.blade.php
+++ b/resources/themes/pterodactyl/admin/eggs/view.blade.php
@@ -31,7 +31,7 @@
         </div>
     </div>
     <div class="col-xs-12">
-        <div class="callout callout-info">
+        <div class="alert alert-info">
             <strong>Notice:</strong> Editing an Egg or any of the Process Management fields <em>requires</em> that each Daemon be rebooted in order to apply the changes.
         </div>
     </div>
@@ -159,14 +159,19 @@
                 </div>
                 <div class="box-footer">
                     {!! csrf_field() !!}
+                    <button type="submit" name="_method" value="PATCH" class="btn btn-primary btn-sm pull-right">Save</button>
+                    <a href="{{ route('admin.nests.egg.export', ['option' => $egg->id]) }}" class="btn btn-sm btn-info pull-right" style="margin-right:10px;">Export</a>
                     <button id="deleteButton" type="submit" name="_method" value="DELETE" class="btn btn-danger btn-sm muted muted-hover">
                         <i class="fa fa-trash-o"></i>
                     </button>
-                    <button type="submit" name="_method" value="PATCH" class="btn btn-primary btn-sm pull-right">Save</button>
-                    <a href="{{ route('admin.nests.egg.export', ['option' => $egg->id]) }}" class="btn btn-sm btn-info pull-right" style="margin-right:10px;">Export</a>
                 </div>
             </div>
         </div>
+        <div class="col-xs-12">
+            <div class="alert alert-info">
+                <strong>Notice:</strong> Editing an Egg or any of the Process Management fields <em>requires</em> that each Daemon be rebooted in order to apply the changes.
+            </div>
+        </div>
     </div>
 </form>
 @endsection
diff --git a/resources/themes/pterodactyl/admin/locations/view.blade.php b/resources/themes/pterodactyl/admin/locations/view.blade.php
index fdb791754..2264ee694 100644
--- a/resources/themes/pterodactyl/admin/locations/view.blade.php
+++ b/resources/themes/pterodactyl/admin/locations/view.blade.php
@@ -39,8 +39,8 @@
                 <div class="box-footer">
                     {!! csrf_field() !!}
                     {!! method_field('PATCH') !!}
-                    <button name="action" value="delete" class="btn btn-sm btn-danger pull-left muted muted-hover"><i class="fa fa-trash-o"></i></button>
                     <button name="action" value="edit" class="btn btn-sm btn-primary pull-right">Save</button>
+                    <button name="action" value="delete" class="btn btn-sm btn-danger pull-left muted muted-hover"><i class="fa fa-trash-o"></i></button>
                 </div>
             </form>
         </div>
diff --git a/resources/themes/pterodactyl/admin/packs/modal.blade.php b/resources/themes/pterodactyl/admin/packs/modal.blade.php
index 2ce57f2b1..dbf2044e0 100644
--- a/resources/themes/pterodactyl/admin/packs/modal.blade.php
+++ b/resources/themes/pterodactyl/admin/packs/modal.blade.php
@@ -38,8 +38,8 @@
                 </div>
                 <div class="modal-footer">
                     {!! csrf_field() !!}
-                    <button type="button" class="btn btn-default btn-sm pull-left" data-dismiss="modal">Cancel</button>
                     <button type="submit" name="action" value="from_template" class="btn btn-primary btn-sm">Install</button>
+                    <button type="button" class="btn btn-default btn-sm pull-left" data-dismiss="modal">Cancel</button>
                 </div>
             </form>
         </div>
diff --git a/resources/themes/pterodactyl/admin/packs/view.blade.php b/resources/themes/pterodactyl/admin/packs/view.blade.php
index 0f4a38e7b..e530bc9c4 100644
--- a/resources/themes/pterodactyl/admin/packs/view.blade.php
+++ b/resources/themes/pterodactyl/admin/packs/view.blade.php
@@ -98,8 +98,8 @@
                 </div>
                 <div class="box-footer with-border">
                     {!! csrf_field() !!}
-                    <button name="_method" value="DELETE" class="btn btn-sm btn-danger pull-left muted muted-hover" type="submit"><i class="fa fa-trash-o"></i></button>
                     <button name="_method" value="PATCH" class="btn btn-sm btn-primary pull-right" type="submit">Save</button>
+                    <button name="_method" value="DELETE" class="btn btn-sm btn-danger pull-left muted muted-hover" type="submit"><i class="fa fa-trash-o"></i></button>
                 </div>
             </div>
         </div>
diff --git a/resources/themes/pterodactyl/server/schedules/view.blade.php b/resources/themes/pterodactyl/server/schedules/view.blade.php
index 87b15ad5f..370b4f0b0 100644
--- a/resources/themes/pterodactyl/server/schedules/view.blade.php
+++ b/resources/themes/pterodactyl/server/schedules/view.blade.php
@@ -122,14 +122,14 @@
                     <div>
                         <p class="text-muted small">@lang('server.schedule.task_help')</p>
                     </div>
-                    <div class="pull-left">
-                        <button type="submit" class="btn btn-sm btn-danger muted muted-hover" id="deleteButton" name="_method" value="DELETE"><i class="fa fa-trash-o"></i></button>
-                    </div>
                     <div class="pull-right">
                         {!! csrf_field() !!}
                         <button type="button" class="btn btn-sm btn-default" data-action="add-new-task"><i class="fa fa-plus"></i> @lang('server.schedule.task.add_more')</button>
                         <button type="submit" class="btn btn-sm btn-success" name="_method" value="PATCH">@lang('server.schedule.manage.submit')</button>
                     </div>
+                    <div class="pull-left">
+                        <button type="submit" class="btn btn-sm btn-danger muted muted-hover" id="deleteButton" name="_method" value="DELETE"><i class="fa fa-trash-o"></i></button>
+                    </div>
                 </div>
             </div>
         </div>