diff --git a/extensions/machine-learning/src/views/models/modelManagementController.ts b/extensions/machine-learning/src/views/models/modelManagementController.ts
index e993b1aa75..22d90a7699 100644
--- a/extensions/machine-learning/src/views/models/modelManagementController.ts
+++ b/extensions/machine-learning/src/views/models/modelManagementController.ts
@@ -170,7 +170,7 @@ export class ModelManagementController extends ControllerBase {
 		});
 		view.on(PredictWizardEventName, async (args) => {
 			const models = <ImportedModel[] | undefined>args;
-			await this.executeAction(view, PredictWizardEventName, args, this.predictModel, models, view, this, this._apiWrapper, this._root);
+			await this.executeAction(view, PredictWizardEventName, args, this.predictModel, models, undefined, this, this._apiWrapper, this._root);
 		});
 		view.on(EditModelEventName, async (args) => {
 			const model = <ImportedModel>args;
diff --git a/extensions/machine-learning/src/views/models/tableSelectionComponent.ts b/extensions/machine-learning/src/views/models/tableSelectionComponent.ts
index 5211af988a..5ef160efcf 100644
--- a/extensions/machine-learning/src/views/models/tableSelectionComponent.ts
+++ b/extensions/machine-learning/src/views/models/tableSelectionComponent.ts
@@ -93,13 +93,17 @@ export class TableSelectionComponent extends ModelViewBase implements IDataCompo
 			}
 		}).component();
 
-		this._existingTableButton.onDidClick(() => {
+		this._existingTableButton.onDidClick(async () => {
 			this._existingTablesSelected = true;
 			this.refreshTableComponent();
+			this._selectedTableName = <string>this._tables?.value ?? '';
+			await this.onTableSelected();
 		});
-		this._newTableButton.onDidClick(() => {
+		this._newTableButton.onDidClick(async () => {
 			this._existingTablesSelected = false;
 			this.refreshTableComponent();
+			this._selectedTableName = '';
+			await this.onTableSelected();
 		});
 		this._newTableName.onTextChanged(async () => {
 			if (this._newTableName) {
@@ -209,7 +213,7 @@ export class TableSelectionComponent extends ModelViewBase implements IDataCompo
 	}
 
 	public get isDataValid(): boolean {
-		return this.data !== undefined && this.data.databaseName !== this._settings.defaultDbName && this.data.tableName !== this._settings.defaultTableName;
+		return this.data !== undefined && this.data.databaseName !== '' && this.data.tableName !== '' && this.data.databaseName !== undefined && this.data.tableName !== undefined && this.data.databaseName !== this._settings.defaultDbName && this.data.tableName !== this._settings.defaultTableName;
 	}
 
 	/**