diff --git a/less/documentDB.less b/less/documentDB.less
index 7ccaf4255..bc36d1483 100644
--- a/less/documentDB.less
+++ b/less/documentDB.less
@@ -2895,6 +2895,14 @@ a:link {
   .pageOptionsPart {
     padding-bottom: @MediumSpace;
   }
+
+  .legendLabel {
+    border-bottom: 0px;
+    width: auto;
+    font-size: @mediumFontSize;
+    display: inline !important;
+    float: left;
+  }
 }
 
 // TODO: Remove these styles once we refactor all buttons to use the command button component
diff --git a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
index 2a06ce497..9abc63f82 100644
--- a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
+++ b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
@@ -1,4 +1,4 @@
-import { Checkbox, ChoiceGroup, IChoiceGroupOption, SpinButton, Stack, Text } from "@fluentui/react";
+import { Checkbox, ChoiceGroup, IChoiceGroupOption, SpinButton } from "@fluentui/react";
 import * as Constants from "Common/Constants";
 import { InfoTooltip } from "Common/Tooltip/InfoTooltip";
 import { configContext } from "ConfigContext";
@@ -115,9 +115,15 @@ export const SettingsPane: FunctionComponent = () => {
   };
 
   const choiceButtonStyles = {
+    root: {
+      clear: "both",
+    },
     flexContainer: [
       {
         selectors: {
+          ".ms-ChoiceFieldGroup root-133": {
+            clear: "both",
+          },
           ".ms-ChoiceField-wrapper label": {
             fontSize: 12,
             paddingTop: 0,
@@ -135,22 +141,22 @@ export const SettingsPane: FunctionComponent = () => {
         {shouldShowQueryPageOptions && (
           <div className="settingsSection">
             <div className="settingsSectionPart">
-              <Stack horizontal>
-                <Text id="pageOptions" className="settingsSectionLabel" variant="small">
-                  Page options
-                </Text>
+              <fieldset>
+                <legend id="pageOptions" className="settingsSectionLabel legendLabel">
+                  Page Options
+                </legend>
                 <InfoTooltip>
                   Choose Custom to specify a fixed amount of query results to show, or choose Unlimited to show as many
                   query results per page.
                 </InfoTooltip>
-              </Stack>
-              <ChoiceGroup
-                ariaLabelledBy="pageOptions"
-                selectedKey={pageOption}
-                options={pageOptionList}
-                styles={choiceButtonStyles}
-                onChange={handleOnPageOptionChange}
-              />
+                <ChoiceGroup
+                  ariaLabelledBy="pageOptions"
+                  selectedKey={pageOption}
+                  options={pageOptionList}
+                  styles={choiceButtonStyles}
+                  onChange={handleOnPageOptionChange}
+                />
+              </fieldset>
             </div>
             <div className="tabs settingsSectionPart">
               {isCustomPageOptionSelected() && (