diff --git a/awx/ui/client/src/inventories/manage/groups/groups-list.controller.js b/awx/ui/client/src/inventories/manage/groups/groups-list.controller.js
index 965b3e67af..e17a43f3be 100644
--- a/awx/ui/client/src/inventories/manage/groups/groups-list.controller.js
+++ b/awx/ui/client/src/inventories/manage/groups/groups-list.controller.js
@@ -25,20 +25,34 @@
         $scope.deleteGroup = function(group){
             $scope.toDelete = {};
             angular.extend($scope.toDelete, group);
+            if($scope.toDelete.total_groups === 0 && $scope.toDelete.total_hosts === 0) {
+                // This group doesn't have any child groups or hosts - the user is just trying to delete
+                // the group
+                $scope.deleteOption = "delete";
+            }
             $('#group-delete-modal').modal('show');
         };
         $scope.confirmDelete = function(){
+
+            // Bind an even listener for the modal closing.  Trying to $state.go() before the modal closes
+            // will mean that these two things are running async and the modal may not finish closing before
+            // the state finishes transitioning.
+            $('#group-delete-modal').off('hidden.bs.modal').on('hidden.bs.modal', function () {
+                // Remove the event handler so that we don't end up with multiple bindings
+                $('#group-delete-modal').off('hidden.bs.modal');
+                // Reload the inventory manage page and show that the group has been removed
+                $state.go('inventoryManage', null, {reload: true});
+            });
+
             switch($scope.deleteOption){
                 case 'promote':
                     GroupManageService.promote($scope.toDelete.id, $stateParams.inventory_id)
                         .then(() => {
-                            $state.go('inventoryManage', null, {reload: true});
                             $('#group-delete-modal').modal('hide');
                         });
                     break;
                 case 'delete':
                     GroupManageService.delete($scope.toDelete.id).then(() => {
-                        $state.go('inventoryManage', null, {reload: true});
                         $('#group-delete-modal').modal('hide');
                     });
             }
diff --git a/awx/ui/client/src/inventories/manage/groups/groups-list.partial.html b/awx/ui/client/src/inventories/manage/groups/groups-list.partial.html
index 84f0025183..50c687e18e 100644
--- a/awx/ui/client/src/inventories/manage/groups/groups-list.partial.html
+++ b/awx/ui/client/src/inventories/manage/groups/groups-list.partial.html
@@ -1,4 +1,4 @@
-<div id="groups-list" class="Panel"></div>        
+<div id="groups-list" class="Panel"></div>
 <div class="modal fade GroupDelete" id="group-delete-modal" role="dialog">
     <div class="modal-dialog">
         <div class="modal-content Modal-content">
@@ -14,7 +14,7 @@
                         <p class="Prompt-bodyQuery">Deleting group <em>{{ toDelete.name }}</em>.
                         <span ng-show="toDelete.total_groups > 0 && toDelete.total_hosts > 0"> This group contains {{ toDelete.total_groups }} groups and {{ toDelete.total_hosts }} hosts. </span>
                         <span ng-show="toDelete.total_groups == 0 && toDelete.total_hosts > 0"> This group contains {{ toDelete.total_hosts }} hosts. </span>
-                        <span ng-show="groupsCopunt > 0 && toDelete.total_hosts == 0"> This group contains {{ toDelete.total_groups }} groups. </span>
+                        <span ng-show="toDelete.total_groups > 0 && toDelete.total_hosts == 0"> This group contains {{ toDelete.total_groups }} groups. </span>
                         Delete or promote the group's children?</p>
                         <div style="margin: 15px auto;">
 
@@ -64,10 +64,10 @@
                 <div class="GroupDelete-help--container">
                     <a href="" id="awp-promote" href="" aw-pop-over="<dl><dt>Delete</dt><dd>Deletes groups and hosts associated with the group being deleted. If a group or host is associated with other groups, it will still exist within those groups. Otherwise, the associated groups and hosts will no longer appear in the inventory.</dd>\n<dt style='margin-top: 5px;'>Promote</dt><dd>Groups and hosts associated with the group being removed will be promoted root level. Note: groups already associated with other groups cannot be promoted.</dd></dl>\n" aw-tool-tip="Click for help"  data-placement="right" data-container="body" data-title="Help" class="help-link"><i class="fa fa-question-circle"></i> Click for help</a>
                 </div>
-                  <a href="" ng-class="promptActionBtnClass" ng-click="confirmDelete()" id="prompt_action_btn" class="btn Modal-footerButton Modal-errorButton">DELETE</a>
                   <a href="#" data-target="#group-delete-modal" data-dismiss="modal" id="prompt_cancel_btn" class="btn Modal-defaultButton Modal-footerButton">CANCEL</a>
+                  <a href="" ng-class="promptActionBtnClass" ng-click="confirmDelete()" id="prompt_action_btn" class="btn Modal-footerButton Modal-errorButton">DELETE</a>
               </div>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>