diff --git a/awx/ui/client/lib/components/layout/layout.partial.html b/awx/ui/client/lib/components/layout/layout.partial.html
index 9354f06dce..a0ba95341b 100644
--- a/awx/ui/client/lib/components/layout/layout.partial.html
+++ b/awx/ui/client/lib/components/layout/layout.partial.html
@@ -14,6 +14,11 @@
{{ $parent.layoutVm.currentUsername }}
+
+
+
+
+
diff --git a/awx/ui/client/src/about/about.controller.js b/awx/ui/client/src/about/about.controller.js
index 992279aedc..868adf01dc 100644
--- a/awx/ui/client/src/about/about.controller.js
+++ b/awx/ui/client/src/about/about.controller.js
@@ -1,5 +1,5 @@
-export default ['$rootScope', '$scope', '$state', 'ConfigService',
- ($rootScope, $scope, $state, ConfigService) => {
+export default ['$rootScope', '$scope', '$location', 'ConfigService', 'lastPath',
+ ($rootScope, $scope, $location, ConfigService, lastPath) => {
ConfigService.getConfig()
.then(function(config){
@@ -10,7 +10,7 @@ export default ['$rootScope', '$scope', '$state', 'ConfigService',
$('#about-modal').modal('show');
});
- $('#about-modal').on('hidden.bs.modal', () => $state.go('dashboard'));
+ $('#about-modal').on('hidden.bs.modal', () => $location.url(lastPath));
function createSpeechBubble (brand, version) {
let text = `${brand} ${version}`;
diff --git a/awx/ui/client/src/about/about.route.js b/awx/ui/client/src/about/about.route.js
index e063530c7e..e8fb6b0d10 100644
--- a/awx/ui/client/src/about/about.route.js
+++ b/awx/ui/client/src/about/about.route.js
@@ -9,6 +9,11 @@ export default {
ncyBreadcrumb: {
label: N_("ABOUT")
},
+ resolve: {
+ lastPath: function($location) {
+ return $location.url();
+ }
+ },
onExit: function(){
// hacky way to handle user browsing away via URL bar
$('.modal-backdrop').remove();