diff --git a/Composer/packages/client/src/components/QnA/CreateQnAFromScratchModal.tsx b/Composer/packages/client/src/components/QnA/CreateQnAFromScratchModal.tsx
index 9480141a61..b7308fb5bd 100644
--- a/Composer/packages/client/src/components/QnA/CreateQnAFromScratchModal.tsx
+++ b/Composer/packages/client/src/components/QnA/CreateQnAFromScratchModal.tsx
@@ -42,8 +42,7 @@ export const CreateQnAFromScratchModal: React.FC<CreateQnAFromModalProps> = (pro
 
   formConfig.name.validate = validateName(qnaFiles);
   const { formData, updateField, hasErrors, formErrors } = useForm(formConfig);
-  const disabled = hasErrors;
-
+  const disabled = hasErrors || !formData.name;
   return (
     <Dialog
       dialogContentProps={{