diff --git a/Composer/packages/client/src/pages/design/styles.ts b/Composer/packages/client/src/pages/design/styles.ts
index c6e25e6572..015df4f43d 100644
--- a/Composer/packages/client/src/pages/design/styles.ts
+++ b/Composer/packages/client/src/pages/design/styles.ts
@@ -76,7 +76,7 @@ export const splitPaneWrapper = css`
   flex-grow: 1;
   overflow: hidden;
   height: 100%;
-  @media screen and (max-width: 960px) {
+  @media screen and (max-width: 1080px) {
     .secondary {
       padding-right: 40px;
     }
diff --git a/Composer/packages/client/src/pages/publish/styles.ts b/Composer/packages/client/src/pages/publish/styles.ts
index bbc26e160c..2db22d0fc1 100644
--- a/Composer/packages/client/src/pages/publish/styles.ts
+++ b/Composer/packages/client/src/pages/publish/styles.ts
@@ -49,7 +49,6 @@ export const ContentStyle = css`
 `;
 export const contentEditor = css`
   flex: 4;
-  height: calc(100vh - 200px);
   min-height: 256px;
   position: relative;
   overflow: auto;
diff --git a/Composer/packages/client/src/pages/setting/SettingsPage.tsx b/Composer/packages/client/src/pages/setting/SettingsPage.tsx
index 3df6622b13..cfd1db614b 100644
--- a/Composer/packages/client/src/pages/setting/SettingsPage.tsx
+++ b/Composer/packages/client/src/pages/setting/SettingsPage.tsx
@@ -35,6 +35,7 @@ const header = css`
 
 const pageWrapper = css`
   overflow: auto;
+  height: 100%;
   > div {
     min-width: 1030px;
     min-height: 400px;