diff --git a/app/gui/NavigableMessageDialog.qml b/app/gui/NavigableMessageDialog.qml
index 2a5a22dd..d06826e7 100644
--- a/app/gui/NavigableMessageDialog.qml
+++ b/app/gui/NavigableMessageDialog.qml
@@ -2,8 +2,6 @@ import QtQuick 2.0
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.2
 
-import SystemProperties 1.0
-
 NavigableDialog {
     id: dialog
 
@@ -11,6 +9,7 @@ NavigableDialog {
 
     property string helpText
     property string helpUrl : "https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting"
+    property string helpTextSeparator : " "
 
     onOpened: {
         // Force keyboard focus on the label so keyboard navigation works
@@ -35,7 +34,7 @@ NavigableDialog {
             property string dialogText
 
             id: dialogLabel
-            text: dialogText + (SystemProperties.hasBrowser ? (" " + helpText) : "")
+            text: dialogText + ((helpText && (standardButtons & Dialog.Help)) ? (helpTextSeparator + helpText) : "")
             wrapMode: Text.WordWrap
 
             // Cap the width so the dialog doesn't grow horizontally forever. This
diff --git a/app/gui/main.qml b/app/gui/main.qml
index 22fa9a5e..c9e85208 100644
--- a/app/gui/main.qml
+++ b/app/gui/main.qml
@@ -405,6 +405,7 @@ ApplicationWindow {
         id: unmappedGamepadDialog
         property string unmappedGamepads : ""
         text: "Moonlight detected gamepads without a mapping:\n" + unmappedGamepads
+        helpTextSeparator: "\n\n"
         helpText: "Click the Help button for information on how to map your gamepads."
         helpUrl: "https://github.com/moonlight-stream/moonlight-docs/wiki/Gamepad-Mapping"
     }