diff --git a/src/components/runners/ImportRunnerModal.svelte b/src/components/runners/ImportRunnerModal.svelte
index 520b970d..e17944bc 100644
--- a/src/components/runners/ImportRunnerModal.svelte
+++ b/src/components/runners/ImportRunnerModal.svelte
@@ -38,10 +38,16 @@
   let orgs = [];
   RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => {
     orgs = val;
+    if(opened_from === 'OrgOverview'){
+    selected_org = orgs[0].id
+  }
   });
   let teams = [];
   RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
     teams = val;
+    if (opened_from === "RunnerOverview") {
+      selected_org_or_team = "TEAM_" + teams[0].id;
+    }
   });
   let selected_org;
   $: selected_org_or_team = "";