diff --git a/locales/en/messages.json b/locales/en/messages.json
index 8b2a636332..6de601524f 100755
--- a/locales/en/messages.json
+++ b/locales/en/messages.json
@@ -3388,7 +3388,8 @@
         "message": "Target:"
     },
     "firmwareFlasherTargetWikiUrlInfo": {
-        "message": "Get more information about target at Betaflight wiki (wiki url found in unified target configuration)"
+        "message": "Get more information about the target on the Betaflight Wiki",
+        "description": "Link to Betaflight support for target"
     },
     "firmwareFlasherReleaseMCU": {
         "message": "MCU:"
@@ -7361,5 +7362,9 @@
     "showDevToolsOnStartup": {
         "message": "Automatically open DevTools in development mode",
         "description": "Text for the option to enable automatic opening of DevTools in debug mode"
+    },
+    "betaflightSupportButton": {
+        "message": "Wiki",
+        "description": "Text for the button to open the support URL"
     }
 }
diff --git a/src/css/tabs/firmware_flasher.less b/src/css/tabs/firmware_flasher.less
index cb6641a7cc..769050c2d6 100644
--- a/src/css/tabs/firmware_flasher.less
+++ b/src/css/tabs/firmware_flasher.less
@@ -174,6 +174,9 @@
 			font-size: 11px;
 		}
 	}
+	.board_support {
+		float: right;
+	}
 	.build_configuration_toggle_wrapper {
 		float: left;
 		position: absolute;
diff --git a/src/js/gui.js b/src/js/gui.js
index 1f3a506243..75b8d4927e 100644
--- a/src/js/gui.js
+++ b/src/js/gui.js
@@ -311,10 +311,11 @@ class GuiControl {
 
         this.switchery();
 
-        const documentationButton = $('div#content #button-documentation');
         const tRex = GUI.active_tab.replaceAll('_', '-').toLowerCase();
 
-        documentationButton.html("Wiki").attr("href", `https://betaflight.com/docs/wiki/configurator/${tRex}-tab`);
+        $('div#content #button-documentation')
+        .html(i18n.getMessage('betaflightSupportButton'))
+        .attr("href", `https://betaflight.com/docs/wiki/configurator/${tRex}-tab`);
 
         // loading tooltip
         $(function () {
diff --git a/src/js/tabs/firmware_flasher.js b/src/js/tabs/firmware_flasher.js
index aefed8996d..5f1117786c 100644
--- a/src/js/tabs/firmware_flasher.js
+++ b/src/js/tabs/firmware_flasher.js
@@ -106,16 +106,6 @@ firmware_flasher.initialize = function (callback) {
             $('div.release_info #targetMCU').text(summary.mcu);
             $('div.release_info .configFilename').text(self.isConfigLocal ? self.configFilename : "[default]");
 
-            // Wiki link: #wiki found in unified target configuration, if board description exist or generel board missing
-            let urlWiki = 'https://betaflight.com/docs/wiki/boards/missing';                // generel board missing
-            const urlBoard = `https://betaflight.com/docs/wiki/boards/${summary.target}`;   // board description
-            if (urlExists(urlBoard)) {
-                urlWiki = urlBoard;
-            }
-            const targetWiki = $('#targetWikiInfoUrl');
-            targetWiki.html(`   [Wiki]`);
-            targetWiki.attr("href", urlWiki);
-
             if (summary.cloudBuild) {
                 $('div.release_info #cloudTargetInfo').show();
                 $('div.release_info #cloudTargetLog').text('');
@@ -934,6 +924,17 @@ firmware_flasher.initialize = function (callback) {
             }
         }).trigger('change');
 
+        const targetSupportInfo = $('#targetSupportInfoUrl');
+
+        targetSupportInfo.on('click', function() {
+            let urlSupport = 'https://betaflight.com/docs/wiki/boards/missing';                 // general board missing
+            const urlBoard = `https://betaflight.com/docs/wiki/boards/${self.selectedBoard}`;   // board description
+            if (urlExists(urlBoard)) {
+                urlSupport = urlBoard;
+            }
+            targetSupportInfo.attr("href", urlSupport);
+        });
+
         const detectBoardElement = $('a.detect-board');
 
         detectBoardElement.on('click', () => {
diff --git a/src/tabs/firmware_flasher.html b/src/tabs/firmware_flasher.html
index acf8788e92..3e357c9391 100644
--- a/src/tabs/firmware_flasher.html
+++ b/src/tabs/firmware_flasher.html
@@ -223,7 +223,12 @@
                 <div class="margin-bottom">
                     <strong i18n="firmwareFlasherReleaseTarget"></strong>
                     <span class="target"></span>
-                    <a id="targetWikiInfoUrl" i18n_title="firmwareFlasherTargetWikiUrlInfo" href="#" class="name" target="_blank"></a>
+                    <div class="board_support">
+                        <div class="btn default_btn">
+                            <a id="targetSupportInfoUrl" href="#" target="_blank" i18n="betaflightSupportButton"></a>
+                        </div>
+                        <div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherTargetSupportUrlInfo"></div>
+                    </div>
                     <div id="manufacturerInfo">
                         <strong i18n="firmwareFlasherReleaseManufacturer"></strong>
                         <span id="manufacturer"></span>