diff --git a/frontend/src/components/TModal.vue b/frontend/src/components/TModal.vue
index 404818e4..7dc913d2 100644
--- a/frontend/src/components/TModal.vue
+++ b/frontend/src/components/TModal.vue
@@ -18,9 +18,6 @@ const modals: Record<string, Component> = {
   machineSetDestroy: defineAsyncComponent(() => import('@/views/Modals/MachineSetDestroy.vue')),
   maintenanceUpdate: defineAsyncComponent(() => import('@/views/Modals/MaintenanceUpdate.vue')),
   downloadOmnictlBinaries: defineAsyncComponent(() => import('@/views/Modals/DownloadOmnictl.vue')),
-  downloadTalosctlBinaries: defineAsyncComponent(
-    () => import('@/views/Modals/DownloadTalosctl.vue'),
-  ),
   exportClusterTemplate: defineAsyncComponent(
     () => import('@/views/Modals/ExportClusterTemplate.vue'),
   ),
diff --git a/frontend/src/views/Home/HomeGeneralInformation.vue b/frontend/src/views/Home/HomeGeneralInformation.vue
index f6fb1b1d..e2dc931e 100644
--- a/frontend/src/views/Home/HomeGeneralInformation.vue
+++ b/frontend/src/views/Home/HomeGeneralInformation.vue
@@ -6,7 +6,7 @@ included in the LICENSE file.
 -->
 <script setup lang="ts">
 import { useClipboard } from '@vueuse/core'
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 
 import { Runtime } from '@/api/common/omni.pb'
 import type { DefaultJoinTokenSpec, SiderolinkAPIConfigSpec } from '@/api/omni/specs/siderolink.pb'
@@ -34,11 +34,13 @@ import {
 import { usePermissions } from '@/methods/auth'
 import { useFeatures } from '@/methods/features'
 import { useResourceWatch } from '@/methods/useResourceWatch'
+import DownloadTalosctl from '@/views/Home/components/DownloadTalosctl.vue'
 import HomeGeneralInformationCopyable from '@/views/Home/HomeGeneralInformationCopyable.vue'
 
 const features = useFeatures()
 const { canReadJoinTokens, canReadAuditLog } = usePermissions()
 const auditLogAvailable = computed(() => !!features.data.value?.spec.audit_log_enabled)
+const downloadTalosctlOpen = ref(false)
 
 const { copy, copied } = useClipboard()
 
@@ -161,7 +163,7 @@ const {
         variant="primary"
         icon="talos-config"
         icon-position="left"
-        @click="$router.push({ query: { modal: 'downloadTalosctlBinaries' } })"
+        @click="downloadTalosctlOpen = true"
       >
         Download talosctl
       </TButton>
@@ -194,5 +196,7 @@ const {
         Audit logs
       </TButton>
     </section>
+
+    <DownloadTalosctl v-model:open="downloadTalosctlOpen" />
   </Card>
 </template>
diff --git a/frontend/src/views/Modals/DownloadTalosctl.stories.ts b/frontend/src/views/Home/components/DownloadTalosctl.stories.ts
similarity index 100%
rename from frontend/src/views/Modals/DownloadTalosctl.stories.ts
rename to frontend/src/views/Home/components/DownloadTalosctl.stories.ts
diff --git a/frontend/src/views/Modals/DownloadTalosctl.vue b/frontend/src/views/Home/components/DownloadTalosctl.vue
similarity index 77%
rename from frontend/src/views/Modals/DownloadTalosctl.vue
rename to frontend/src/views/Home/components/DownloadTalosctl.vue
index 0e04ac98..b919f3a1 100644
--- a/frontend/src/views/Modals/DownloadTalosctl.vue
+++ b/frontend/src/views/Home/components/DownloadTalosctl.vue
@@ -7,28 +7,15 @@ included in the LICENSE file.
 <script setup lang="ts">
 import { computedAsync } from '@vueuse/core'
 import { computed, ref } from 'vue'
-import { useRouter } from 'vue-router'
 
-import TButton from '@/components/Button/TButton.vue'
 import CodeBlock from '@/components/CodeBlock/CodeBlock.vue'
+import Modal from '@/components/Modals/Modal.vue'
 import TSelectList from '@/components/SelectList/TSelectList.vue'
 import TSpinner from '@/components/Spinner/TSpinner.vue'
 import { getDocsLink, getPlatform } from '@/methods'
 import { useTalosctlDownloads } from '@/methods/useTalosctlDownloads'
-import CloseButton from '@/views/Modals/CloseButton.vue'
 
-const router = useRouter()
-let closed = false
-
-const close = () => {
-  if (closed) {
-    return
-  }
-
-  closed = true
-
-  router.go(-1)
-}
+const open = defineModel<boolean>('open', { default: false })
 
 const platform = computedAsync(getPlatform)
 
@@ -50,7 +37,7 @@ const selectedVersion = ref<string>()
 const selectedPlatform = ref<string>()
 
 const download = () => {
-  close()
+  open.value = false
 
   if (!selectedVersion.value) return
 
@@ -76,13 +63,8 @@ const versionBinaries = computed<string[]>(() => {
 </script>
 
 <template>
-  <div class="modal-window">
-    <div class="heading">
-      <h3 class="text-base text-naturals-n14">Download Talosctl</h3>
-      <CloseButton @click="close" />
-    </div>
-
-    <p class="mb-5 text-xs">
+  <Modal v-model:open="open" title="Download Talosctl" action-label="Download" @confirm="download">
+    <template #description>
       <code>talosctl</code>
       can be used to access cluster nodes using Talos machine API. Read the
       <a
@@ -94,7 +76,7 @@ const versionBinaries = computed<string[]>(() => {
         docs
       </a>
       for more information.
-    </p>
+    </template>
 
     <div class="mb-5 flex flex-col gap-2">
       <span class="text-xs text-naturals-n14">macOS and Linux (recommended)</span>
@@ -137,26 +119,5 @@ const versionBinaries = computed<string[]>(() => {
       </a>
       .
     </p>
-
-    <div class="mt-8 flex justify-end gap-4">
-      <TButton class="h-9 w-32" @click="close">
-        <span>Cancel</span>
-      </TButton>
-      <TButton class="h-9 w-32" @click="download">
-        <span>Download</span>
-      </TButton>
-    </div>
-  </div>
+  </Modal>
 </template>
-
-<style scoped>
-@reference "../../index.css";
-
-.modal-window {
-  @apply h-auto w-1/3 p-8;
-}
-
-.heading {
-  @apply mb-5 flex items-center justify-between text-xl text-naturals-n14;
-}
-</style>