diff --git a/src/components/change-version-dialog.tsx b/src/components/change-version-dialog.tsx
index 3ef049a..f633a93 100644
--- a/src/components/change-version-dialog.tsx
+++ b/src/components/change-version-dialog.tsx
@@ -164,13 +164,60 @@ export function ChangeVersionDialog({
             </div>
           </div>
 
-          {!releaseTypes.stable || !releaseTypes.nightly ? (
+          {!releaseTypes.stable && !releaseTypes.nightly ? (
             <Alert>
               <AlertDescription>
-                Only {profile.release_type} releases are available for{" "}
+                No releases are available for{" "}
                 {getBrowserDisplayName(profile.browser)}.
               </AlertDescription>
             </Alert>
+          ) : !releaseTypes.stable || !releaseTypes.nightly ? (
+            <div className="space-y-4">
+              <Alert>
+                <AlertDescription>
+                  Only {profile.release_type} releases are available for{" "}
+                  {getBrowserDisplayName(profile.browser)}.
+                </AlertDescription>
+              </Alert>
+              <div className="grid gap-2">
+                <Label>New Release Type</Label>
+                {isLoadingReleaseTypes ? (
+                  <div className="text-sm text-muted-foreground">
+                    Loading release types...
+                  </div>
+                ) : (
+                  <div className="space-y-4">
+                    {selectedReleaseType &&
+                      selectedReleaseType !== profile.release_type &&
+                      selectedVersion &&
+                      !isVersionDownloaded(selectedVersion) && (
+                        <Alert>
+                          <AlertDescription>
+                            You must download{" "}
+                            {getBrowserDisplayName(profile.browser)}{" "}
+                            {selectedVersion} before switching to this release
+                            type. Use the download button above to get the
+                            latest version.
+                          </AlertDescription>
+                        </Alert>
+                      )}
+
+                    <ReleaseTypeSelector
+                      selectedReleaseType={selectedReleaseType}
+                      onReleaseTypeSelect={setSelectedReleaseType}
+                      availableReleaseTypes={releaseTypes}
+                      browser={profile.browser}
+                      isDownloading={isDownloading}
+                      onDownload={() => {
+                        void handleDownload();
+                      }}
+                      placeholder="Select release type..."
+                      downloadedVersions={downloadedVersions}
+                    />
+                  </div>
+                )}
+              </div>
+            </div>
           ) : (
             <div className="grid gap-2">
               <Label>New Release Type</Label>
@@ -179,18 +226,35 @@ export function ChangeVersionDialog({
                   Loading release types...
                 </div>
               ) : (
-                <ReleaseTypeSelector
-                  selectedReleaseType={selectedReleaseType}
-                  onReleaseTypeSelect={setSelectedReleaseType}
-                  availableReleaseTypes={releaseTypes}
-                  browser={profile.browser}
-                  isDownloading={isDownloading}
-                  onDownload={() => {
-                    void handleDownload();
-                  }}
-                  placeholder="Select release type..."
-                  downloadedVersions={downloadedVersions}
-                />
+                <div className="space-y-4">
+                  {selectedReleaseType &&
+                    selectedReleaseType !== profile.release_type &&
+                    selectedVersion &&
+                    !isVersionDownloaded(selectedVersion) && (
+                      <Alert>
+                        <AlertDescription>
+                          You must download{" "}
+                          {getBrowserDisplayName(profile.browser)}{" "}
+                          {selectedVersion} before switching to this release
+                          type. Use the download button above to get the latest
+                          version.
+                        </AlertDescription>
+                      </Alert>
+                    )}
+
+                  <ReleaseTypeSelector
+                    selectedReleaseType={selectedReleaseType}
+                    onReleaseTypeSelect={setSelectedReleaseType}
+                    availableReleaseTypes={releaseTypes}
+                    browser={profile.browser}
+                    isDownloading={isDownloading}
+                    onDownload={() => {
+                      void handleDownload();
+                    }}
+                    placeholder="Select release type..."
+                    downloadedVersions={downloadedVersions}
+                  />
+                </div>
               )}
             </div>
           )}
diff --git a/src/components/create-profile-dialog.tsx b/src/components/create-profile-dialog.tsx
index f3e2219..da27c15 100644
--- a/src/components/create-profile-dialog.tsx
+++ b/src/components/create-profile-dialog.tsx
@@ -93,6 +93,7 @@ export function CreateProfileDialog({
     isDownloading,
     downloadedVersions,
     loadDownloadedVersions,
+    isVersionDownloaded,
   } = useBrowserDownload();
 
   const {
@@ -280,6 +281,7 @@ export function CreateProfileDialog({
     selectedBrowser &&
     selectedReleaseType &&
     selectedVersion &&
+    isVersionDownloaded(selectedVersion) &&
     (!proxyEnabled || isProxyDisabled || (proxyHost && proxyPort)) &&
     !nameError;
 
@@ -370,37 +372,48 @@ export function CreateProfileDialog({
             </Select>
           </div>
 
-          {selectedBrowser &&
-          (!releaseTypes.stable || !releaseTypes.nightly) ? (
-            <Alert>
-              <AlertDescription>
-                Only {(releaseTypes.stable && "Stable") ?? "Nightly"} releases
-                are available for {getBrowserDisplayName(selectedBrowser)}.
-              </AlertDescription>
-            </Alert>
-          ) : (
+          {selectedBrowser ? (
             <div className="grid gap-2">
               <Label>Release Type</Label>
               {isLoadingReleaseTypes ? (
                 <div className="text-sm text-muted-foreground">
                   Loading release types...
                 </div>
+              ) : Object.keys(releaseTypes).length === 0 ? (
+                <Alert>
+                  <AlertDescription>
+                    No releases are available for{" "}
+                    {getBrowserDisplayName(selectedBrowser)}.
+                  </AlertDescription>
+                </Alert>
               ) : (
-                <ReleaseTypeSelector
-                  selectedReleaseType={selectedReleaseType}
-                  onReleaseTypeSelect={setSelectedReleaseType}
-                  availableReleaseTypes={releaseTypes}
-                  browser={selectedBrowser ?? ""}
-                  isDownloading={isDownloading}
-                  onDownload={() => {
-                    void handleDownload();
-                  }}
-                  placeholder="Select release type..."
-                  downloadedVersions={downloadedVersions}
-                />
+                <div className="space-y-4">
+                  {(!releaseTypes.stable || !releaseTypes.nightly) && (
+                    <Alert>
+                      <AlertDescription>
+                        Only {(releaseTypes.stable && "Stable") ?? "Nightly"}{" "}
+                        releases are available for{" "}
+                        {getBrowserDisplayName(selectedBrowser)}.
+                      </AlertDescription>
+                    </Alert>
+                  )}
+
+                  <ReleaseTypeSelector
+                    selectedReleaseType={selectedReleaseType}
+                    onReleaseTypeSelect={setSelectedReleaseType}
+                    availableReleaseTypes={releaseTypes}
+                    browser={selectedBrowser}
+                    isDownloading={isDownloading}
+                    onDownload={() => {
+                      void handleDownload();
+                    }}
+                    placeholder="Select release type..."
+                    downloadedVersions={downloadedVersions}
+                  />
+                </div>
               )}
             </div>
-          )}
+          ) : null}
 
           {/* Proxy Settings */}
           <div className="grid gap-4 pt-4 border-t">