diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index 64a942c0d3ef..46eff70b0af2 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -84,7 +84,8 @@ public enum ViewHelper {
         "/rhn/channels/ChannelDetail.do",
         "/rhn/software/packages/Details.do",
         "/rhn/manager/systems/details/formulas",
-        "/rhn/manager/cm/imagestores"
+        "/rhn/manager/cm/imagestores",
+        "/rhn/manager/systems/details/highstate"
     );
 
     ViewHelper() { }
diff --git a/web/html/src/branding/css/susemanager/components/buttons.scss b/web/html/src/branding/css/susemanager/components/buttons.scss
index 54e81df03b27..42cd59aa318c 100644
--- a/web/html/src/branding/css/susemanager/components/buttons.scss
+++ b/web/html/src/branding/css/susemanager/components/buttons.scss
@@ -11,6 +11,14 @@
   }
 }
 
+.btn {
+  &,
+  &:active,
+  &:first-child:active {
+    border-color: transparent;
+  }
+}
+
 .btn,
 .btn-default,
 .btn-primary,
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index 35bce1959b09..303d3c204ba2 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -28,6 +28,7 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/software/packages/Details.do",
   "/rhn/manager/systems/details/formulas",
   "/rhn/manager/cm/imagestores",
+  "/rhn/manager/systems/details/highstate",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/html/src/manager/state/display-highstate.tsx b/web/html/src/manager/state/display-highstate.tsx
index f0b5e276c5af..dde0cee22204 100644
--- a/web/html/src/manager/state/display-highstate.tsx
+++ b/web/html/src/manager/state/display-highstate.tsx
@@ -5,7 +5,7 @@ import HighstateSummary from "./highstate-summary";
 
 function MinionHighstateSingle({ minion }: { minion: { id: number; name: string } }) {
   return (
-    <div className="row">
+    <div>
       <h3>{t("State Summary for {name}", { name: minion.name })}</h3>
       <HighstateSummary minionId={minion.id} />
     </div>
diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-system-highstate-page-layout b/web/spacewalk-web.changes.bisht-richa.fixed-system-highstate-page-layout
new file mode 100644
index 000000000000..963bdff1060c
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fixed-system-highstate-page-layout
@@ -0,0 +1 @@
+- Fixed broken layout of system highstate page