diff --git a/src/app/clientsettings/clientsettings.tsx b/src/app/clientsettings/clientsettings.tsx
index 9572e7c9c..a32c6b49d 100644
--- a/src/app/clientsettings/clientsettings.tsx
+++ b/src/app/clientsettings/clientsettings.tsx
@@ -136,6 +136,12 @@ class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hove
         commandRtnHandler(prtn, this.errorMessage);
     }
 
+    @boundMethod
+    inlineUpdateOpenAIBaseURL(newBaseURL: string): void {
+        const prtn = GlobalCommandRunner.setClientOpenAISettings({ baseurl: newBaseURL });
+        commandRtnHandler(prtn, this.errorMessage);
+    }
+
     @boundMethod
     setErrorMessage(msg: string): void {
         mobx.action(() => {
@@ -255,7 +261,7 @@ class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hove
                         </div>
                     </div>
                     <div className="settings-field">
-                        <div className="settings-label">OpenAI Token</div>
+                        <div className="settings-label">AI Token</div>
                         <div className="settings-input">
                             <InlineSettingsTextEdit
                                 placeholder=""
@@ -268,7 +274,20 @@ class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hove
                         </div>
                     </div>
                     <div className="settings-field">
-                        <div className="settings-label">OpenAI Model</div>
+                        <div className="settings-label">AI Base URL</div>
+                        <div className="settings-input">
+                            <InlineSettingsTextEdit
+                                placeholder=""
+                                text={isBlank(openAIOpts.baseurl) ? "openai default" : openAIOpts.baseurl}
+                                value={openAIOpts.baseurl ?? ""}
+                                onChange={this.inlineUpdateOpenAIBaseURL}
+                                maxLength={10}
+                                showIcon={true}
+                            />
+                        </div>
+                    </div>
+                    <div className="settings-field">
+                        <div className="settings-label">AI Model</div>
                         <div className="settings-input">
                             <InlineSettingsTextEdit
                                 placeholder="gpt-3.5-turbo"
@@ -281,7 +300,7 @@ class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hove
                         </div>
                     </div>
                     <div className="settings-field">
-                        <div className="settings-label">OpenAI MaxTokens</div>
+                        <div className="settings-label">AI MaxTokens</div>
                         <div className="settings-input">
                             <InlineSettingsTextEdit
                                 placeholder=""
diff --git a/src/models/commandrunner.ts b/src/models/commandrunner.ts
index 364094db4..b8b72119a 100644
--- a/src/models/commandrunner.ts
+++ b/src/models/commandrunner.ts
@@ -373,7 +373,12 @@ class CommandRunner {
         return GlobalModel.submitCommand("client", "set", null, kwargs, interactive);
     }
 
-    setClientOpenAISettings(opts: { model?: string; apitoken?: string; maxtokens?: string }): Promise<CommandRtnType> {
+    setClientOpenAISettings(opts: {
+        model?: string;
+        apitoken?: string;
+        maxtokens?: string;
+        baseurl?: string;
+    }): Promise<CommandRtnType> {
         let kwargs = {
             nohist: "1",
         };
@@ -386,6 +391,9 @@ class CommandRunner {
         if (opts.maxtokens != null) {
             kwargs["openaimaxtokens"] = opts.maxtokens;
         }
+        if (opts.baseurl != null) {
+            kwargs["openaibaseurl"] = opts.baseurl;
+        }
         return GlobalModel.submitCommand("client", "set", null, kwargs, false);
     }
 
diff --git a/src/types/custom.d.ts b/src/types/custom.d.ts
index d94e879ae..d902ee43c 100644
--- a/src/types/custom.d.ts
+++ b/src/types/custom.d.ts
@@ -623,6 +623,7 @@ declare global {
         apitoken?: string;
         maxtokens?: number;
         maxchoices?: number;
+        baseurl?: string;
     };
 
     type PlaybookType = {