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 0bf6f2c96517..3750768fbb0d 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -87,7 +87,8 @@ public enum ViewHelper {
         "/rhn/manager/cm/imagestores",
         "/rhn/manager/systems/details/highstate",
         "/rhn/manager/systems/keys",
-        "/rhn/manager/audit/cve"
+        "/rhn/manager/audit/cve",
+        "/rhn/errata/Search.do"
     );
 
     ViewHelper() { }
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
index 0e5260c7712b..b8d61c952bf7 100644
--- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
@@ -43,7 +43,11 @@
        <div class="panel-body">
          <table class="table">
            <tr>
-             <td><bean:message key="erratasearch.jsp.searchfor"/></td>
+             <td>
+              <label class="w-100 control-label" for="searchfor">
+                <bean:message key="erratasearch.jsp.searchfor"/>
+              </label>
+            </td>
              <td>
               <div class="row-0">
                 <div class="col-md-5">
@@ -56,7 +60,12 @@
                 </div>
              </td>
            </tr>
-           <tr><td><bean:message key="erratasearch.jsp.whatsearch"/></td>
+           <tr>
+            <td>
+              <label class="w-100 control-label" for="whatsearch">
+                <bean:message key="erratasearch.jsp.whatsearch"/>
+              </label>
+            </td>
              <td>
                 <div class="row-0">
                   <div class="col-md-5">
@@ -72,7 +81,12 @@
                 </div>
              </td>
            </tr>
-           <tr><td><bean:message key="erratasearch.jsp.types_to_search"/></td>
+           <tr>
+            <td>
+              <label class="w-100 control-label" for="typeToSearch">
+                <bean:message key="erratasearch.jsp.types_to_search"/>
+              </label>
+            </td>
              <td>
                 <div class="checkbox icon-wrapper">
                   <html:checkbox property="errata_type_bug">
@@ -95,7 +109,11 @@
             </td>
            </tr>
            <tr>
-            <td><bean:message key="erratasearch.jsp.issue_date"/></td>
+            <td>
+              <label class="w-100 control-label" for="issueDate">
+                <bean:message key="erratasearch.jsp.issue_date"/>
+              </label>
+            </td>
                 <td>
                   <div class="checkbox">
                     <html:checkbox styleId="issueDateOptionsCheckBox" property="optionIssueDateSearch" onclick="javascript:issueDateSearchOptions()" >
@@ -129,7 +147,11 @@
                 </td>
            </tr>
            <tr>
-              <td><label for="fineGrainedlabel"><bean:message key="systemsearch.jsp.finegrainedlabel"/></label></td>
+              <td>
+                <label class="w-100 control-label" for="fineGrainedlabel">
+                  <bean:message key="systemsearch.jsp.finegrainedlabel"/>
+                </label>
+              </td>
               <td>
                 <div class="checkbox">
                   <html:checkbox property="fineGrained" styleId="fineGrainedlabel"> <label for="fineGrainedlabel"><bean:message key="systemsearch.jsp.finegrained"/></label></html:checkbox>
diff --git a/java/spacewalk-java.changes.bisht-richa.fixed-advanced-package-search-layout b/java/spacewalk-java.changes.bisht-richa.fixed-advanced-package-search-layout
new file mode 100644
index 000000000000..5322671eb01b
--- /dev/null
+++ b/java/spacewalk-java.changes.bisht-richa.fixed-advanced-package-search-layout
@@ -0,0 +1 @@
+- Fixed layout of advanced package search page
diff --git a/web/html/src/branding/css/base/tables.scss b/web/html/src/branding/css/base/tables.scss
index a341422c6111..50a443fd9bcb 100644
--- a/web/html/src/branding/css/base/tables.scss
+++ b/web/html/src/branding/css/base/tables.scss
@@ -9,6 +9,10 @@
   > tbody > tr:last-child > * {
     border-bottom-width: 0;
   }
+
+  .table {
+    background-color: $white;
+  }
 }
 
 .table > thead > tr.active > th {
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index ee82ef186824..a03a800d9d24 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -31,6 +31,7 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/manager/systems/details/highstate",
   "/rhn/manager/systems/keys",
   "/rhn/manager/audit/cve",
+  "/rhn/errata/Search.do",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-advanced-package-search-layout b/web/spacewalk-web.changes.bisht-richa.fixed-advanced-package-search-layout
new file mode 100644
index 000000000000..5322671eb01b
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fixed-advanced-package-search-layout
@@ -0,0 +1 @@
+- Fixed layout of advanced package search page