diff --git a/client/src/modules/settings.js b/client/src/modules/settings.js
index 91f436cf..84db1674 100644
--- a/client/src/modules/settings.js
+++ b/client/src/modules/settings.js
@@ -13,6 +13,7 @@ import { EmoteModule } from 'builtin';
 import { SettingsSet } from 'structs';
 import { FileUtils, ClientLogger as Logger } from 'common';
 import path from 'path';
+import process from 'process';
 import Globals from './globals';
 import CssEditor from './csseditor';
 import Events from './events';
@@ -39,6 +40,12 @@ export default new class Settings {
 
             return set;
         });
+
+        // Set a hint for each platform for the use-keytar setting
+        const useKeytarSetting = this.getSetting('security', 'default', 'use-keytar');
+        if (process.platform === 'win32') useKeytarSetting.hint = 'Store the master password in Credential Manager';
+        if (process.platform === 'darwin') useKeytarSetting.hint = 'Store the master password in the default keychain';
+        if (process.platform === 'linux') useKeytarSetting.hint = 'Store the master password in libsecret';
     }
 
     /**