diff --git a/src/Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal.test.tsx b/src/Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal.test.tsx
new file mode 100644
index 000000000..17ebfa422
--- /dev/null
+++ b/src/Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal.test.tsx
@@ -0,0 +1,122 @@
+import { Checkbox, ChoiceGroup, DefaultButton, IconButton, PrimaryButton, TextField } from "@fluentui/react";
+import { QueryCopilotFeedbackModal } from "Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal";
+import { submitFeedback } from "Explorer/QueryCopilot/QueryCopilotUtilities";
+import { getUserEmail } from "Utils/UserUtils";
+import { shallow } from "enzyme";
+import { useQueryCopilot } from "hooks/useQueryCopilot";
+import React from "react";
+
+jest.mock("Utils/UserUtils");
+(getUserEmail as jest.Mock).mockResolvedValue("test@email.com");
+
+jest.mock("Explorer/QueryCopilot/QueryCopilotUtilities");
+submitFeedback as jest.Mock;
+
+describe("Query Copilot Feedback Modal snapshot test", () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+  it("shoud render and match snapshot", () => {
+    useQueryCopilot.getState().openFeedbackModal("test query", false, "test prompt");
+
+    const wrapper = shallow(<QueryCopilotFeedbackModal />);
+
+    expect(wrapper.props().isOpen).toBeTruthy();
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it("should close on cancel click", () => {
+    const wrapper = shallow(<QueryCopilotFeedbackModal />);
+
+    const cancelButton = wrapper.find(IconButton);
+    cancelButton.simulate("click");
+    wrapper.setProps({});
+
+    expect(wrapper.props().isOpen).toBeFalsy();
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it("should get user unput", () => {
+    const wrapper = shallow(<QueryCopilotFeedbackModal />);
+    const testUserInput = "test user input";
+
+    const userInput = wrapper.find(TextField).first();
+    userInput.simulate("change", {}, testUserInput);
+
+    expect(wrapper.find(TextField).first().props().value).toEqual(testUserInput);
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it("should record user contact choice no", () => {
+    const wrapper = shallow(<QueryCopilotFeedbackModal />);
+    const contactAllowed = wrapper.find(ChoiceGroup);
+
+    contactAllowed.simulate("change", {}, { key: "no" });
+
+    expect(getUserEmail).toHaveBeenCalledTimes(3);
+    expect(wrapper.find(ChoiceGroup).props().selectedKey).toEqual("no");
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it("should record user contact choice yes", () => {
+    const wrapper = shallow(<QueryCopilotFeedbackModal />);
+    const contactAllowed = wrapper.find(ChoiceGroup);
+
+    contactAllowed.simulate("change", {}, { key: "yes" });
+
+    expect(getUserEmail).toHaveBeenCalledTimes(4);
+    expect(wrapper.find(ChoiceGroup).props().selectedKey).toEqual("yes");
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it("should not render dont show again button", () => {
+    const wrapper = shallow(<QueryCopilotFeedbackModal />);
+
+    const dontShowAgain = wrapper.find(Checkbox);
+
+    expect(dontShowAgain).toHaveLength(0);
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it("should render dont show again button and check it ", () => {
+    useQueryCopilot.getState().openFeedbackModal("test query", true, "test prompt");
+    const wrapper = shallow(<QueryCopilotFeedbackModal />);
+
+    const dontShowAgain = wrapper.find(Checkbox);
+    dontShowAgain.simulate("change", {}, true);
+
+    expect(wrapper.find(Checkbox)).toHaveLength(1);
+    expect(wrapper.find(Checkbox).first().props().checked).toBeTruthy();
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it("should cancel submission", () => {
+    const wrapper = shallow(<QueryCopilotFeedbackModal />);
+
+    const cancelButton = wrapper.find(DefaultButton);
+    cancelButton.simulate("click");
+    wrapper.setProps({});
+
+    expect(wrapper.props().isOpen).toBeFalsy();
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it("should submit submission", () => {
+    const wrapper = shallow(<QueryCopilotFeedbackModal />);
+
+    const submitButton = wrapper.find(PrimaryButton);
+    submitButton.simulate("click");
+    wrapper.setProps({});
+
+    expect(submitFeedback).toHaveBeenCalledTimes(1);
+    expect(submitFeedback).toHaveBeenCalledWith({
+      likeQuery: false,
+      generatedQuery: "",
+      userPrompt: "",
+      description: "",
+      contact: getUserEmail(),
+    });
+    expect(wrapper.props().isOpen).toBeFalsy();
+    expect(wrapper).toMatchSnapshot();
+  });
+});
diff --git a/src/Explorer/QueryCopilot/QueryCopilotFeedbackModal.tsx b/src/Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal.tsx
similarity index 98%
rename from src/Explorer/QueryCopilot/QueryCopilotFeedbackModal.tsx
rename to src/Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal.tsx
index 8f60a3ddf..6b634b4f6 100644
--- a/src/Explorer/QueryCopilot/QueryCopilotFeedbackModal.tsx
+++ b/src/Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal.tsx
@@ -13,7 +13,7 @@ import {
 import { submitFeedback } from "Explorer/QueryCopilot/QueryCopilotUtilities";
 import { useQueryCopilot } from "hooks/useQueryCopilot";
 import React from "react";
-import { getUserEmail } from "../../Utils/UserUtils";
+import { getUserEmail } from "../../../Utils/UserUtils";
 
 export const QueryCopilotFeedbackModal: React.FC = (): JSX.Element => {
   const {
@@ -28,6 +28,7 @@ export const QueryCopilotFeedbackModal: React.FC = (): JSX.Element => {
   const [description, setDescription] = React.useState<string>("");
   const [doNotShowAgainChecked, setDoNotShowAgainChecked] = React.useState<boolean>(false);
   const [contact, setContact] = React.useState<string>(getUserEmail());
+
   return (
     <Modal isOpen={showFeedbackModal}>
       <Stack style={{ padding: 24 }}>
diff --git a/src/Explorer/QueryCopilot/Modal/WelcomeModal.test.tsx b/src/Explorer/QueryCopilot/Modal/WelcomeModal.test.tsx
index 63dc8af04..4ae0d75cf 100644
--- a/src/Explorer/QueryCopilot/Modal/WelcomeModal.test.tsx
+++ b/src/Explorer/QueryCopilot/Modal/WelcomeModal.test.tsx
@@ -3,7 +3,7 @@ import { withHooks } from "jest-react-hooks-shallow";
 import React from "react";
 import { WelcomeModal } from "./WelcomeModal";
 
-describe("Query Copilot Carousel snapshot test", () => {
+describe("Query Copilot Welcome Modal snapshot test", () => {
   it("should render when isOpen is true", () => {
     withHooks(() => {
       const spy = jest.spyOn(localStorage, "setItem");
diff --git a/src/Explorer/QueryCopilot/Modal/__snapshots__/QueryCopilotFeedbackModal.test.tsx.snap b/src/Explorer/QueryCopilot/Modal/__snapshots__/QueryCopilotFeedbackModal.test.tsx.snap
new file mode 100644
index 000000000..568095d89
--- /dev/null
+++ b/src/Explorer/QueryCopilot/Modal/__snapshots__/QueryCopilotFeedbackModal.test.tsx.snap
@@ -0,0 +1,1393 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Query Copilot Feedback Modal snapshot test shoud render and match snapshot 1`] = `
+<Modal
+  isOpen={true}
+>
+  <Stack
+    style={
+      Object {
+        "padding": 24,
+      }
+    }
+  >
+    <Stack
+      horizontal={true}
+      horizontalAlign="space-between"
+    >
+      <Text
+        style={
+          Object {
+            "fontSize": 20,
+            "fontWeight": 600,
+            "marginBottom": 20,
+          }
+        }
+      >
+        Send feedback to Microsoft
+      </Text>
+      <CustomizedIconButton
+        iconProps={
+          Object {
+            "iconName": "Cancel",
+          }
+        }
+        onClick={[Function]}
+      />
+    </Stack>
+    <Text
+      style={
+        Object {
+          "fontSize": 14,
+          "marginBottom": 14,
+        }
+      }
+    >
+      Your feedback will help improve the experience.
+    </Text>
+    <StyledTextFieldBase
+      label="Description"
+      multiline={true}
+      onChange={[Function]}
+      placeholder="Provide more details"
+      required={true}
+      rows={3}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+      value=""
+    />
+    <StyledTextFieldBase
+      defaultValue="test query"
+      label="Query generated"
+      readOnly={true}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <StyledChoiceGroup
+      label="May we contact you about your feedback?"
+      onChange={[Function]}
+      options={
+        Array [
+          Object {
+            "key": "yes",
+            "text": "Yes, you may contact me.",
+          },
+          Object {
+            "key": "no",
+            "text": "No, do not contact me.",
+          },
+        ]
+      }
+      selectedKey="yes"
+      styles={
+        Object {
+          "flexContainer": Object {
+            "selectors": Object {
+              ".ms-ChoiceField-field::after": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceField-field::before": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceFieldLabel": Object {
+                "paddingLeft": 6,
+              },
+            },
+          },
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <Text
+      style={
+        Object {
+          "fontSize": 12,
+          "marginBottom": 14,
+        }
+      }
+    >
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
+       
+      <StyledLinkBase
+        href=""
+        target="_blank"
+      >
+        Privacy statement
+      </StyledLinkBase>
+    </Text>
+    <Stack
+      horizontal={true}
+      horizontalAlign="end"
+    >
+      <CustomizedPrimaryButton
+        onClick={[Function]}
+        styles={
+          Object {
+            "root": Object {
+              "marginRight": 8,
+            },
+          }
+        }
+      >
+        Submit
+      </CustomizedPrimaryButton>
+      <CustomizedDefaultButton
+        onClick={[Function]}
+      >
+        Cancel
+      </CustomizedDefaultButton>
+    </Stack>
+  </Stack>
+</Modal>
+`;
+
+exports[`Query Copilot Feedback Modal snapshot test should cancel submission 1`] = `
+<Modal
+  isOpen={false}
+>
+  <Stack
+    style={
+      Object {
+        "padding": 24,
+      }
+    }
+  >
+    <Stack
+      horizontal={true}
+      horizontalAlign="space-between"
+    >
+      <Text
+        style={
+          Object {
+            "fontSize": 20,
+            "fontWeight": 600,
+            "marginBottom": 20,
+          }
+        }
+      >
+        Send feedback to Microsoft
+      </Text>
+      <CustomizedIconButton
+        iconProps={
+          Object {
+            "iconName": "Cancel",
+          }
+        }
+        onClick={[Function]}
+      />
+    </Stack>
+    <Text
+      style={
+        Object {
+          "fontSize": 14,
+          "marginBottom": 14,
+        }
+      }
+    >
+      Your feedback will help improve the experience.
+    </Text>
+    <StyledTextFieldBase
+      label="Description"
+      multiline={true}
+      onChange={[Function]}
+      placeholder="Provide more details"
+      required={true}
+      rows={3}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+      value=""
+    />
+    <StyledTextFieldBase
+      defaultValue=""
+      label="Query generated"
+      readOnly={true}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <StyledChoiceGroup
+      label="May we contact you about your feedback?"
+      onChange={[Function]}
+      options={
+        Array [
+          Object {
+            "key": "yes",
+            "text": "Yes, you may contact me.",
+          },
+          Object {
+            "key": "no",
+            "text": "No, do not contact me.",
+          },
+        ]
+      }
+      selectedKey="yes"
+      styles={
+        Object {
+          "flexContainer": Object {
+            "selectors": Object {
+              ".ms-ChoiceField-field::after": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceField-field::before": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceFieldLabel": Object {
+                "paddingLeft": 6,
+              },
+            },
+          },
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <Text
+      style={
+        Object {
+          "fontSize": 12,
+          "marginBottom": 14,
+        }
+      }
+    >
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
+       
+      <StyledLinkBase
+        href=""
+        target="_blank"
+      >
+        Privacy statement
+      </StyledLinkBase>
+    </Text>
+    <Stack
+      horizontal={true}
+      horizontalAlign="end"
+    >
+      <CustomizedPrimaryButton
+        onClick={[Function]}
+        styles={
+          Object {
+            "root": Object {
+              "marginRight": 8,
+            },
+          }
+        }
+      >
+        Submit
+      </CustomizedPrimaryButton>
+      <CustomizedDefaultButton
+        onClick={[Function]}
+      >
+        Cancel
+      </CustomizedDefaultButton>
+    </Stack>
+  </Stack>
+</Modal>
+`;
+
+exports[`Query Copilot Feedback Modal snapshot test should close on cancel click 1`] = `
+<Modal
+  isOpen={false}
+>
+  <Stack
+    style={
+      Object {
+        "padding": 24,
+      }
+    }
+  >
+    <Stack
+      horizontal={true}
+      horizontalAlign="space-between"
+    >
+      <Text
+        style={
+          Object {
+            "fontSize": 20,
+            "fontWeight": 600,
+            "marginBottom": 20,
+          }
+        }
+      >
+        Send feedback to Microsoft
+      </Text>
+      <CustomizedIconButton
+        iconProps={
+          Object {
+            "iconName": "Cancel",
+          }
+        }
+        onClick={[Function]}
+      />
+    </Stack>
+    <Text
+      style={
+        Object {
+          "fontSize": 14,
+          "marginBottom": 14,
+        }
+      }
+    >
+      Your feedback will help improve the experience.
+    </Text>
+    <StyledTextFieldBase
+      label="Description"
+      multiline={true}
+      onChange={[Function]}
+      placeholder="Provide more details"
+      required={true}
+      rows={3}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+      value=""
+    />
+    <StyledTextFieldBase
+      defaultValue=""
+      label="Query generated"
+      readOnly={true}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <StyledChoiceGroup
+      label="May we contact you about your feedback?"
+      onChange={[Function]}
+      options={
+        Array [
+          Object {
+            "key": "yes",
+            "text": "Yes, you may contact me.",
+          },
+          Object {
+            "key": "no",
+            "text": "No, do not contact me.",
+          },
+        ]
+      }
+      selectedKey="yes"
+      styles={
+        Object {
+          "flexContainer": Object {
+            "selectors": Object {
+              ".ms-ChoiceField-field::after": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceField-field::before": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceFieldLabel": Object {
+                "paddingLeft": 6,
+              },
+            },
+          },
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <Text
+      style={
+        Object {
+          "fontSize": 12,
+          "marginBottom": 14,
+        }
+      }
+    >
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
+       
+      <StyledLinkBase
+        href=""
+        target="_blank"
+      >
+        Privacy statement
+      </StyledLinkBase>
+    </Text>
+    <Stack
+      horizontal={true}
+      horizontalAlign="end"
+    >
+      <CustomizedPrimaryButton
+        onClick={[Function]}
+        styles={
+          Object {
+            "root": Object {
+              "marginRight": 8,
+            },
+          }
+        }
+      >
+        Submit
+      </CustomizedPrimaryButton>
+      <CustomizedDefaultButton
+        onClick={[Function]}
+      >
+        Cancel
+      </CustomizedDefaultButton>
+    </Stack>
+  </Stack>
+</Modal>
+`;
+
+exports[`Query Copilot Feedback Modal snapshot test should get user unput 1`] = `
+<Modal
+  isOpen={false}
+>
+  <Stack
+    style={
+      Object {
+        "padding": 24,
+      }
+    }
+  >
+    <Stack
+      horizontal={true}
+      horizontalAlign="space-between"
+    >
+      <Text
+        style={
+          Object {
+            "fontSize": 20,
+            "fontWeight": 600,
+            "marginBottom": 20,
+          }
+        }
+      >
+        Send feedback to Microsoft
+      </Text>
+      <CustomizedIconButton
+        iconProps={
+          Object {
+            "iconName": "Cancel",
+          }
+        }
+        onClick={[Function]}
+      />
+    </Stack>
+    <Text
+      style={
+        Object {
+          "fontSize": 14,
+          "marginBottom": 14,
+        }
+      }
+    >
+      Your feedback will help improve the experience.
+    </Text>
+    <StyledTextFieldBase
+      label="Description"
+      multiline={true}
+      onChange={[Function]}
+      placeholder="Provide more details"
+      required={true}
+      rows={3}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+      value="test user input"
+    />
+    <StyledTextFieldBase
+      defaultValue=""
+      label="Query generated"
+      readOnly={true}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <StyledChoiceGroup
+      label="May we contact you about your feedback?"
+      onChange={[Function]}
+      options={
+        Array [
+          Object {
+            "key": "yes",
+            "text": "Yes, you may contact me.",
+          },
+          Object {
+            "key": "no",
+            "text": "No, do not contact me.",
+          },
+        ]
+      }
+      selectedKey="yes"
+      styles={
+        Object {
+          "flexContainer": Object {
+            "selectors": Object {
+              ".ms-ChoiceField-field::after": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceField-field::before": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceFieldLabel": Object {
+                "paddingLeft": 6,
+              },
+            },
+          },
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <Text
+      style={
+        Object {
+          "fontSize": 12,
+          "marginBottom": 14,
+        }
+      }
+    >
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
+       
+      <StyledLinkBase
+        href=""
+        target="_blank"
+      >
+        Privacy statement
+      </StyledLinkBase>
+    </Text>
+    <Stack
+      horizontal={true}
+      horizontalAlign="end"
+    >
+      <CustomizedPrimaryButton
+        onClick={[Function]}
+        styles={
+          Object {
+            "root": Object {
+              "marginRight": 8,
+            },
+          }
+        }
+      >
+        Submit
+      </CustomizedPrimaryButton>
+      <CustomizedDefaultButton
+        onClick={[Function]}
+      >
+        Cancel
+      </CustomizedDefaultButton>
+    </Stack>
+  </Stack>
+</Modal>
+`;
+
+exports[`Query Copilot Feedback Modal snapshot test should not render dont show again button 1`] = `
+<Modal
+  isOpen={false}
+>
+  <Stack
+    style={
+      Object {
+        "padding": 24,
+      }
+    }
+  >
+    <Stack
+      horizontal={true}
+      horizontalAlign="space-between"
+    >
+      <Text
+        style={
+          Object {
+            "fontSize": 20,
+            "fontWeight": 600,
+            "marginBottom": 20,
+          }
+        }
+      >
+        Send feedback to Microsoft
+      </Text>
+      <CustomizedIconButton
+        iconProps={
+          Object {
+            "iconName": "Cancel",
+          }
+        }
+        onClick={[Function]}
+      />
+    </Stack>
+    <Text
+      style={
+        Object {
+          "fontSize": 14,
+          "marginBottom": 14,
+        }
+      }
+    >
+      Your feedback will help improve the experience.
+    </Text>
+    <StyledTextFieldBase
+      label="Description"
+      multiline={true}
+      onChange={[Function]}
+      placeholder="Provide more details"
+      required={true}
+      rows={3}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+      value=""
+    />
+    <StyledTextFieldBase
+      defaultValue=""
+      label="Query generated"
+      readOnly={true}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <StyledChoiceGroup
+      label="May we contact you about your feedback?"
+      onChange={[Function]}
+      options={
+        Array [
+          Object {
+            "key": "yes",
+            "text": "Yes, you may contact me.",
+          },
+          Object {
+            "key": "no",
+            "text": "No, do not contact me.",
+          },
+        ]
+      }
+      selectedKey="yes"
+      styles={
+        Object {
+          "flexContainer": Object {
+            "selectors": Object {
+              ".ms-ChoiceField-field::after": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceField-field::before": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceFieldLabel": Object {
+                "paddingLeft": 6,
+              },
+            },
+          },
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <Text
+      style={
+        Object {
+          "fontSize": 12,
+          "marginBottom": 14,
+        }
+      }
+    >
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
+       
+      <StyledLinkBase
+        href=""
+        target="_blank"
+      >
+        Privacy statement
+      </StyledLinkBase>
+    </Text>
+    <Stack
+      horizontal={true}
+      horizontalAlign="end"
+    >
+      <CustomizedPrimaryButton
+        onClick={[Function]}
+        styles={
+          Object {
+            "root": Object {
+              "marginRight": 8,
+            },
+          }
+        }
+      >
+        Submit
+      </CustomizedPrimaryButton>
+      <CustomizedDefaultButton
+        onClick={[Function]}
+      >
+        Cancel
+      </CustomizedDefaultButton>
+    </Stack>
+  </Stack>
+</Modal>
+`;
+
+exports[`Query Copilot Feedback Modal snapshot test should record user contact choice no 1`] = `
+<Modal
+  isOpen={false}
+>
+  <Stack
+    style={
+      Object {
+        "padding": 24,
+      }
+    }
+  >
+    <Stack
+      horizontal={true}
+      horizontalAlign="space-between"
+    >
+      <Text
+        style={
+          Object {
+            "fontSize": 20,
+            "fontWeight": 600,
+            "marginBottom": 20,
+          }
+        }
+      >
+        Send feedback to Microsoft
+      </Text>
+      <CustomizedIconButton
+        iconProps={
+          Object {
+            "iconName": "Cancel",
+          }
+        }
+        onClick={[Function]}
+      />
+    </Stack>
+    <Text
+      style={
+        Object {
+          "fontSize": 14,
+          "marginBottom": 14,
+        }
+      }
+    >
+      Your feedback will help improve the experience.
+    </Text>
+    <StyledTextFieldBase
+      label="Description"
+      multiline={true}
+      onChange={[Function]}
+      placeholder="Provide more details"
+      required={true}
+      rows={3}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+      value=""
+    />
+    <StyledTextFieldBase
+      defaultValue=""
+      label="Query generated"
+      readOnly={true}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <StyledChoiceGroup
+      label="May we contact you about your feedback?"
+      onChange={[Function]}
+      options={
+        Array [
+          Object {
+            "key": "yes",
+            "text": "Yes, you may contact me.",
+          },
+          Object {
+            "key": "no",
+            "text": "No, do not contact me.",
+          },
+        ]
+      }
+      selectedKey="no"
+      styles={
+        Object {
+          "flexContainer": Object {
+            "selectors": Object {
+              ".ms-ChoiceField-field::after": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceField-field::before": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceFieldLabel": Object {
+                "paddingLeft": 6,
+              },
+            },
+          },
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <Text
+      style={
+        Object {
+          "fontSize": 12,
+          "marginBottom": 14,
+        }
+      }
+    >
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
+       
+      <StyledLinkBase
+        href=""
+        target="_blank"
+      >
+        Privacy statement
+      </StyledLinkBase>
+    </Text>
+    <Stack
+      horizontal={true}
+      horizontalAlign="end"
+    >
+      <CustomizedPrimaryButton
+        onClick={[Function]}
+        styles={
+          Object {
+            "root": Object {
+              "marginRight": 8,
+            },
+          }
+        }
+      >
+        Submit
+      </CustomizedPrimaryButton>
+      <CustomizedDefaultButton
+        onClick={[Function]}
+      >
+        Cancel
+      </CustomizedDefaultButton>
+    </Stack>
+  </Stack>
+</Modal>
+`;
+
+exports[`Query Copilot Feedback Modal snapshot test should record user contact choice yes 1`] = `
+<Modal
+  isOpen={false}
+>
+  <Stack
+    style={
+      Object {
+        "padding": 24,
+      }
+    }
+  >
+    <Stack
+      horizontal={true}
+      horizontalAlign="space-between"
+    >
+      <Text
+        style={
+          Object {
+            "fontSize": 20,
+            "fontWeight": 600,
+            "marginBottom": 20,
+          }
+        }
+      >
+        Send feedback to Microsoft
+      </Text>
+      <CustomizedIconButton
+        iconProps={
+          Object {
+            "iconName": "Cancel",
+          }
+        }
+        onClick={[Function]}
+      />
+    </Stack>
+    <Text
+      style={
+        Object {
+          "fontSize": 14,
+          "marginBottom": 14,
+        }
+      }
+    >
+      Your feedback will help improve the experience.
+    </Text>
+    <StyledTextFieldBase
+      label="Description"
+      multiline={true}
+      onChange={[Function]}
+      placeholder="Provide more details"
+      required={true}
+      rows={3}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+      value=""
+    />
+    <StyledTextFieldBase
+      defaultValue=""
+      label="Query generated"
+      readOnly={true}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <StyledChoiceGroup
+      label="May we contact you about your feedback?"
+      onChange={[Function]}
+      options={
+        Array [
+          Object {
+            "key": "yes",
+            "text": "Yes, you may contact me.",
+          },
+          Object {
+            "key": "no",
+            "text": "No, do not contact me.",
+          },
+        ]
+      }
+      selectedKey="yes"
+      styles={
+        Object {
+          "flexContainer": Object {
+            "selectors": Object {
+              ".ms-ChoiceField-field::after": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceField-field::before": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceFieldLabel": Object {
+                "paddingLeft": 6,
+              },
+            },
+          },
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <Text
+      style={
+        Object {
+          "fontSize": 12,
+          "marginBottom": 14,
+        }
+      }
+    >
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
+       
+      <StyledLinkBase
+        href=""
+        target="_blank"
+      >
+        Privacy statement
+      </StyledLinkBase>
+    </Text>
+    <Stack
+      horizontal={true}
+      horizontalAlign="end"
+    >
+      <CustomizedPrimaryButton
+        onClick={[Function]}
+        styles={
+          Object {
+            "root": Object {
+              "marginRight": 8,
+            },
+          }
+        }
+      >
+        Submit
+      </CustomizedPrimaryButton>
+      <CustomizedDefaultButton
+        onClick={[Function]}
+      >
+        Cancel
+      </CustomizedDefaultButton>
+    </Stack>
+  </Stack>
+</Modal>
+`;
+
+exports[`Query Copilot Feedback Modal snapshot test should render dont show again button and check it  1`] = `
+<Modal
+  isOpen={true}
+>
+  <Stack
+    style={
+      Object {
+        "padding": 24,
+      }
+    }
+  >
+    <Stack
+      horizontal={true}
+      horizontalAlign="space-between"
+    >
+      <Text
+        style={
+          Object {
+            "fontSize": 20,
+            "fontWeight": 600,
+            "marginBottom": 20,
+          }
+        }
+      >
+        Send feedback to Microsoft
+      </Text>
+      <CustomizedIconButton
+        iconProps={
+          Object {
+            "iconName": "Cancel",
+          }
+        }
+        onClick={[Function]}
+      />
+    </Stack>
+    <Text
+      style={
+        Object {
+          "fontSize": 14,
+          "marginBottom": 14,
+        }
+      }
+    >
+      Your feedback will help improve the experience.
+    </Text>
+    <StyledTextFieldBase
+      label="Description"
+      multiline={true}
+      onChange={[Function]}
+      placeholder="Provide more details"
+      required={true}
+      rows={3}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+      value=""
+    />
+    <StyledTextFieldBase
+      defaultValue="test query"
+      label="Query generated"
+      readOnly={true}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <StyledChoiceGroup
+      label="May we contact you about your feedback?"
+      onChange={[Function]}
+      options={
+        Array [
+          Object {
+            "key": "yes",
+            "text": "Yes, you may contact me.",
+          },
+          Object {
+            "key": "no",
+            "text": "No, do not contact me.",
+          },
+        ]
+      }
+      selectedKey="yes"
+      styles={
+        Object {
+          "flexContainer": Object {
+            "selectors": Object {
+              ".ms-ChoiceField-field::after": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceField-field::before": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceFieldLabel": Object {
+                "paddingLeft": 6,
+              },
+            },
+          },
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <Text
+      style={
+        Object {
+          "fontSize": 12,
+          "marginBottom": 14,
+        }
+      }
+    >
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
+       
+      <StyledLinkBase
+        href=""
+        target="_blank"
+      >
+        Privacy statement
+      </StyledLinkBase>
+    </Text>
+    <StyledCheckboxBase
+      checked={true}
+      label="Don't show me this next time"
+      onChange={[Function]}
+      styles={
+        Object {
+          "label": Object {
+            "paddingLeft": 0,
+          },
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <Stack
+      horizontal={true}
+      horizontalAlign="end"
+    >
+      <CustomizedPrimaryButton
+        onClick={[Function]}
+        styles={
+          Object {
+            "root": Object {
+              "marginRight": 8,
+            },
+          }
+        }
+      >
+        Submit
+      </CustomizedPrimaryButton>
+      <CustomizedDefaultButton
+        onClick={[Function]}
+      >
+        Cancel
+      </CustomizedDefaultButton>
+    </Stack>
+  </Stack>
+</Modal>
+`;
+
+exports[`Query Copilot Feedback Modal snapshot test should submit submission 1`] = `
+<Modal
+  isOpen={false}
+>
+  <Stack
+    style={
+      Object {
+        "padding": 24,
+      }
+    }
+  >
+    <Stack
+      horizontal={true}
+      horizontalAlign="space-between"
+    >
+      <Text
+        style={
+          Object {
+            "fontSize": 20,
+            "fontWeight": 600,
+            "marginBottom": 20,
+          }
+        }
+      >
+        Send feedback to Microsoft
+      </Text>
+      <CustomizedIconButton
+        iconProps={
+          Object {
+            "iconName": "Cancel",
+          }
+        }
+        onClick={[Function]}
+      />
+    </Stack>
+    <Text
+      style={
+        Object {
+          "fontSize": 14,
+          "marginBottom": 14,
+        }
+      }
+    >
+      Your feedback will help improve the experience.
+    </Text>
+    <StyledTextFieldBase
+      label="Description"
+      multiline={true}
+      onChange={[Function]}
+      placeholder="Provide more details"
+      required={true}
+      rows={3}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+      value=""
+    />
+    <StyledTextFieldBase
+      defaultValue=""
+      label="Query generated"
+      readOnly={true}
+      styles={
+        Object {
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <StyledChoiceGroup
+      label="May we contact you about your feedback?"
+      onChange={[Function]}
+      options={
+        Array [
+          Object {
+            "key": "yes",
+            "text": "Yes, you may contact me.",
+          },
+          Object {
+            "key": "no",
+            "text": "No, do not contact me.",
+          },
+        ]
+      }
+      selectedKey="yes"
+      styles={
+        Object {
+          "flexContainer": Object {
+            "selectors": Object {
+              ".ms-ChoiceField-field::after": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceField-field::before": Object {
+                "marginTop": 4,
+              },
+              ".ms-ChoiceFieldLabel": Object {
+                "paddingLeft": 6,
+              },
+            },
+          },
+          "root": Object {
+            "marginBottom": 14,
+          },
+        }
+      }
+    />
+    <Text
+      style={
+        Object {
+          "fontSize": 12,
+          "marginBottom": 14,
+        }
+      }
+    >
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
+       
+      <StyledLinkBase
+        href=""
+        target="_blank"
+      >
+        Privacy statement
+      </StyledLinkBase>
+    </Text>
+    <Stack
+      horizontal={true}
+      horizontalAlign="end"
+    >
+      <CustomizedPrimaryButton
+        onClick={[Function]}
+        styles={
+          Object {
+            "root": Object {
+              "marginRight": 8,
+            },
+          }
+        }
+      >
+        Submit
+      </CustomizedPrimaryButton>
+      <CustomizedDefaultButton
+        onClick={[Function]}
+      >
+        Cancel
+      </CustomizedDefaultButton>
+    </Stack>
+  </Stack>
+</Modal>
+`;
diff --git a/src/Explorer/QueryCopilot/Modal/__snapshots__/WelcomeModal.test.tsx.snap b/src/Explorer/QueryCopilot/Modal/__snapshots__/WelcomeModal.test.tsx.snap
index f0b77ac4d..3855d8a21 100644
--- a/src/Explorer/QueryCopilot/Modal/__snapshots__/WelcomeModal.test.tsx.snap
+++ b/src/Explorer/QueryCopilot/Modal/__snapshots__/WelcomeModal.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Query Copilot Carousel snapshot test should render when isOpen is true 1`] = `
+exports[`Query Copilot Welcome Modal snapshot test should render when isOpen is true 1`] = `
 <Fragment>
   <Modal
     isBlocking={false}
diff --git a/src/Main.tsx b/src/Main.tsx
index c8bf2163f..9b8087de0 100644
--- a/src/Main.tsx
+++ b/src/Main.tsx
@@ -17,7 +17,7 @@ import "../externals/jquery.typeahead.min.css";
 import "../externals/jquery.typeahead.min.js";
 // Image Dependencies
 import { QueryCopilotCarousel } from "Explorer/QueryCopilot/CopilotCarousel";
-import { QueryCopilotFeedbackModal } from "Explorer/QueryCopilot/QueryCopilotFeedbackModal";
+import { QueryCopilotFeedbackModal } from "Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal";
 import { useQueryCopilot } from "hooks/useQueryCopilot";
 import "../images/CosmosDB_rgb_ui_lighttheme.ico";
 import hdeConnectImage from "../images/HdeConnectCosmosDB.svg";