diff --git a/src/Common/dataAccess/createMaterializedView.ts b/src/Common/dataAccess/createMaterializedView.ts
index 2142e67c2..58cc5cb71 100644
--- a/src/Common/dataAccess/createMaterializedView.ts
+++ b/src/Common/dataAccess/createMaterializedView.ts
@@ -10,7 +10,7 @@ import {
 } from "Utils/arm/generatedClients/cosmos/types";
 import { logConsoleInfo, logConsoleProgress } from "Utils/NotificationConsoleUtils";
 
-export const createMaterializedView = async (params: CreateMaterializedViewsParams): Promise<any> => {
+export const createMaterializedView = async (params: CreateMaterializedViewsParams): Promise<Collection> => {
   const clearMessage = logConsoleProgress(
     `Creating a new materialized view ${params.materializedViewId} for database ${params.databaseId}`,
   );
diff --git a/src/Explorer/Panes/AddMaterializedViewPanel/AddMaterializedViewPanel.tsx b/src/Explorer/Panes/AddMaterializedViewPanel/AddMaterializedViewPanel.tsx
index 99ff89236..42327f72d 100644
--- a/src/Explorer/Panes/AddMaterializedViewPanel/AddMaterializedViewPanel.tsx
+++ b/src/Explorer/Panes/AddMaterializedViewPanel/AddMaterializedViewPanel.tsx
@@ -26,6 +26,10 @@ import {
   scrollToSection,
   shouldShowAnalyticalStoreOptions,
 } from "Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility";
+import {
+  chooseSourceContainerStyle,
+  chooseSourceContainerStyles,
+} from "Explorer/Panes/AddMaterializedViewPanel/AddMaterializedViewPanelStyles";
 import { AddMVAdvancedComponent } from "Explorer/Panes/AddMaterializedViewPanel/AddMVAdvancedComponent";
 import { AddMVAnalyticalStoreComponent } from "Explorer/Panes/AddMaterializedViewPanel/AddMVAnalyticalStoreComponent";
 import { AddMVFullTextSearchComponent } from "Explorer/Panes/AddMaterializedViewPanel/AddMVFullTextSearchComponent";
@@ -321,11 +325,11 @@ export const AddMaterializedViewPanel = (props: AddMaterializedViewPanelProps):
             </Text>
           </Stack>
           <Dropdown
-            placeholder="Choose existing container"
+            placeholder="Choose source container"
             options={sourceContainerOptions}
             defaultSelectedKey={sourceContainer?.rid}
-            styles={{ title: { height: 27, lineHeight: 27 }, dropdownItem: { fontSize: 12 } }}
-            style={{ width: 300, fontSize: 12 }}
+            styles={chooseSourceContainerStyles()}
+            style={chooseSourceContainerStyle()}
             onChange={(_, options: IDropdownOption) => setSelectedSourceContainer(options.data as Collection)}
           />
           <Separator className="panelSeparator" />
@@ -377,7 +381,7 @@ export const AddMaterializedViewPanel = (props: AddMaterializedViewPanelProps):
             placeholder={"SELECT c.email, c.accountId FROM c"}
             size={40}
             className="panelTextField"
-            value={definition}
+            value={definition || ""}
             onChange={(event: React.ChangeEvent<HTMLInputElement>) => setDefinition(event.target.value)}
           />
           <AddMVPartitionKeyComponent
@@ -418,9 +422,9 @@ export const AddMaterializedViewPanel = (props: AddMaterializedViewPanelProps):
           )}
           <AddMVAdvancedComponent {...{ useHashV1, setUseHashV1, setSubPartitionKeys }} />
         </Stack>
-        <PanelFooterComponent buttonLabel="OK" isButtonDisabled={isThroughputCapExceeded} />
-        {isExecuting && <PanelLoadingScreen />}
       </div>
+      <PanelFooterComponent buttonLabel="OK" isButtonDisabled={isThroughputCapExceeded} />
+      {isExecuting && <PanelLoadingScreen />}
     </form>
   );
 };
diff --git a/src/Explorer/Panes/AddMaterializedViewPanel/AddMaterializedViewPanelStyles.ts b/src/Explorer/Panes/AddMaterializedViewPanel/AddMaterializedViewPanelStyles.ts
new file mode 100644
index 000000000..cfb6da846
--- /dev/null
+++ b/src/Explorer/Panes/AddMaterializedViewPanel/AddMaterializedViewPanelStyles.ts
@@ -0,0 +1,15 @@
+import { IDropdownStyleProps, IDropdownStyles, IStyleFunctionOrObject } from "@fluentui/react";
+import { CSSProperties } from "react";
+
+export function chooseSourceContainerStyles(): IStyleFunctionOrObject<IDropdownStyleProps, IDropdownStyles> {
+  return {
+    title: { height: 27, lineHeight: 27 },
+    dropdownItem: { fontSize: 12 },
+    dropdownItemDisabled: { fontSize: 12 },
+    dropdownItemSelected: { fontSize: 12 },
+  };
+}
+
+export function chooseSourceContainerStyle(): CSSProperties {
+  return { width: 300, fontSize: 12 };
+}