diff --git a/packages/app-settings/src/General.tsx b/packages/app-settings/src/General.tsx
index 28d9ced57b..39fd0e64ff 100644
--- a/packages/app-settings/src/General.tsx
+++ b/packages/app-settings/src/General.tsx
@@ -99,7 +99,8 @@ class General extends React.PureComponent<Props, State> {
 
   private renderEndpoint = () => {
     const { t } = this.props;
-    const { isUrlValid, settings: { apiUrl } } = this.state;
+    const { isCustomNode, isUrlValid, settings: { apiUrl } } = this.state;
+    const activeIndex = isCustomNode ? 1 : 0;
 
     const preset = (
       <Dropdown
@@ -125,7 +126,7 @@ class General extends React.PureComponent<Props, State> {
     ];
 
     return (
-      <Tab menu={{ secondary: true }} onTabChange={this.toggleCustomNode} panes={panes} />
+      <Tab menu={{ secondary: true }} activeIndex={activeIndex} onTabChange={this.toggleCustomNode} panes={panes} />
     );
   }