diff --git a/awx/ui/client/lib/components/layout/_index.less b/awx/ui/client/lib/components/layout/_index.less
index 9e50fab35c..7b6e167f8a 100644
--- a/awx/ui/client/lib/components/layout/_index.less
+++ b/awx/ui/client/lib/components/layout/_index.less
@@ -142,31 +142,25 @@
         overflow-x: hidden;
     }
 
+    &-content {
+        flex: 1px;
+    }
+
     &-footer {
-        height: 40px;
         background-color: @at-color-footer-background;
         color: @at-color-footer;
-        z-index: 1040;
-        position: absolute;
-        right: @at-padding-footer-right;
-        left: 0;
-        bottom: 0;
+        position: relative;
+        padding-right: @at-padding-footer-right;
+        padding-bottom: @at-padding-footer-bottom;
+        margin-top: @at-margin-footer-top;
+        flex: 0;
         display: flex;
         align-items: center;
         justify-content: flex-end;
-        margin-left: (@at-width-collapsed-side-nav + 5);
 
         a {
             cursor: pointer;
             margin-right: @at-margin-after-footer-link;
         }
     }
-
-    &-side--expanded {
-        + .at-Layout-main {
-            .at-Layout-footer {
-                margin-left: @at-width-expanded-side-nav;
-            }
-        }
-    }
 }
diff --git a/awx/ui/client/lib/components/layout/layout.partial.html b/awx/ui/client/lib/components/layout/layout.partial.html
index b5e6921fa1..0ffa4a1ad1 100644
--- a/awx/ui/client/lib/components/layout/layout.partial.html
+++ b/awx/ui/client/lib/components/layout/layout.partial.html
@@ -76,8 +76,10 @@
         </at-side-nav-item>
     </at-side-nav>
     <div class="at-Layout-main">
-        <ng-transclude></ng-transclude>
-        <div class="at-Layout-footer">
+        <div class="at-Layout-content">
+            <ng-transclude></ng-transclude>
+        </div>
+        <div class="at-Layout-footer" ng-show="vm.isLoggedIn">
             <a ui-sref="about">{{ vm.getString('FOOTER_ABOUT') }} {{ vm.getString('BRAND_NAME') }}</a>|
                 {{ vm.getString('FOOTER_COPYRIGHT') }}
         </div>
diff --git a/awx/ui/client/lib/theme/_variables.less b/awx/ui/client/lib/theme/_variables.less
index 644cdbf6c3..5660870ca6 100644
--- a/awx/ui/client/lib/theme/_variables.less
+++ b/awx/ui/client/lib/theme/_variables.less
@@ -196,6 +196,7 @@
 @at-padding-side-nav-item-icon: @at-space-3x;
 @at-padding-between-side-nav-icon-text: @at-space-3x;
 @at-padding-footer-right: @at-space-4x;
+@at-padding-footer-bottom: @at-space-4x;
 
 @at-margin-input-message: @at-space;
 @at-margin-item-column: @at-space-3x;
@@ -208,6 +209,7 @@
 @at-margin-top-nav-item-between-icon-and-name: @at-space-2x;
 @at-margin-top-nav-item-icon-socket-top-makeup: -3px;
 @at-margin-after-footer-link: @at-space;
+@at-margin-footer-top: @at-space-4x;
 
 @at-margin-top-search-key: @at-space-2x;