diff --git a/src/app/authoring-tool/select-component/select-component.component.ts b/src/app/authoring-tool/select-component/select-component.component.ts
index 18cb7845b6a..de07665385d 100644
--- a/src/app/authoring-tool/select-component/select-component.component.ts
+++ b/src/app/authoring-tool/select-component/select-component.component.ts
@@ -56,7 +56,7 @@ export class SelectComponentComponent {
     if (numAllowedComponents === 1) {
       this.componentId = allowedComponent.id;
       this.componentChanged();
-    } else {
+    } else if (!this.components.map((component) => component.id).includes(this.componentId)) {
       this.componentId = null;
     }
   }
diff --git a/src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.ts b/src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.ts
index 68ab5c5d27d..d22540fada3 100644
--- a/src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.ts
+++ b/src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.ts
@@ -54,7 +54,6 @@ export class EditGraphConnectedComponentsComponent extends EditConnectedComponen
       connectedComponent.xColumn = 0;
       connectedComponent.yColumn = 1;
     }
-    connectedComponent.type = 'importWork';
   }
 
   connectedComponentShowClassmateWorkChanged(connectedComponent: any) {