diff --git a/Composer/packages/client/src/components/ManageLuis/ManageLuis.tsx b/Composer/packages/client/src/components/ManageLuis/ManageLuis.tsx
index f0d6857d05..2831cf1cf5 100644
--- a/Composer/packages/client/src/components/ManageLuis/ManageLuis.tsx
+++ b/Composer/packages/client/src/components/ManageLuis/ManageLuis.tsx
@@ -665,7 +665,7 @@ export const ManageLuis = (props: ManageLuisProps) => {
         hidden={props.hidden}
         minWidth={480}
         modalProps={{
-          isBlocking: false,
+          isBlocking: true,
         }}
         onDismiss={props.onDismiss}
       >
diff --git a/Composer/packages/client/src/components/ManageQNA/ManageQNA.tsx b/Composer/packages/client/src/components/ManageQNA/ManageQNA.tsx
index 6c6329b8ea..18bcfb19c3 100644
--- a/Composer/packages/client/src/components/ManageQNA/ManageQNA.tsx
+++ b/Composer/packages/client/src/components/ManageQNA/ManageQNA.tsx
@@ -526,7 +526,7 @@ export const ManageQNA = (props: ManageQNAProps) => {
         hidden={props.hidden}
         minWidth={480}
         modalProps={{
-          isBlocking: false,
+          isBlocking: true,
         }}
         onDismiss={props.onDismiss}
       >
diff --git a/Composer/packages/client/src/components/ManageSpeech/ManageSpeech.tsx b/Composer/packages/client/src/components/ManageSpeech/ManageSpeech.tsx
index b03d6e13a0..5c5ab15736 100644
--- a/Composer/packages/client/src/components/ManageSpeech/ManageSpeech.tsx
+++ b/Composer/packages/client/src/components/ManageSpeech/ManageSpeech.tsx
@@ -426,7 +426,7 @@ export const ManageSpeech = (props: ManageSpeechProps) => {
         hidden={props.hidden}
         minWidth={480}
         modalProps={{
-          isBlocking: false,
+          isBlocking: true,
         }}
         onDismiss={props.onDismiss}
       >
diff --git a/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx b/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx
index 9254a12d1e..ed2f0f9f8d 100644
--- a/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx
+++ b/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx
@@ -30,8 +30,8 @@ const container = css`
 
 const idsInTab: Record<PivotItemKey, string[]> = {
   Basics: ['runtimeSettings'],
-  LuisQna: [],
-  Connections: ['connections', 'addNewPublishProfile'],
+  LuisQna: ['luisKey', 'qnaKey'],
+  Connections: ['connections'],
   SkillConfig: [],
   Language: [],
 };