diff --git a/awx/ui/client/src/job-results/host-event/host-event-modal.partial.html b/awx/ui/client/src/job-results/host-event/host-event-modal.partial.html
index 2023129573..e48908f3ff 100644
--- a/awx/ui/client/src/job-results/host-event/host-event-modal.partial.html
+++ b/awx/ui/client/src/job-results/host-event/host-event-modal.partial.html
@@ -9,7 +9,7 @@
 				</a>
 				<span class="HostEvent-title">{{event.host_name}}</span>
 				<!-- close -->
-				<button ui-sref="jobDetail" type="button" class="close">
+				<button ng-click="closeHostEvent()" type="button" class="close">
 					<i class="fa fa-times-circle"></i>
 				</button>
 			</div>
@@ -64,7 +64,7 @@
 
 			<!-- controls -->
 			<div class="HostEvent-controls">
-				<button ui-sref="jobDetail" class="btn btn-sm btn-default HostEvent-close">Close</button>
+				<button ng-click="closeHostEvent()" class="btn btn-sm btn-default HostEvent-close">Close</button>
 			</div>
 		</div>
 		</div>
diff --git a/awx/ui/client/src/job-results/host-event/host-event.controller.js b/awx/ui/client/src/job-results/host-event/host-event.controller.js
index 5059140f00..ae10bccc4d 100644
--- a/awx/ui/client/src/job-results/host-event/host-event.controller.js
+++ b/awx/ui/client/src/job-results/host-event/host-event.controller.js
@@ -45,6 +45,12 @@
             return $scope.hostResults.indexOf(result[0]);
         };
 
+        $scope.closeHostEvent = function() {
+            // Unbind the listener so it doesn't fire when we close the modal via navigation
+            $('#HostEvent').off('hidden.bs.modal');
+            $state.go('jobDetail');
+        };
+
         var init = function(){
             hostEvent.event_name = hostEvent.event;
             $scope.event = _.cloneDeep(hostEvent);
@@ -98,6 +104,10 @@
                 }
             }
             $('#HostEvent').modal('show');
+
+            $('#HostEvent').on('hidden.bs.modal', function () {
+                $scope.closeHostEvent();
+            });
         };
         init();
     }];