3 files changed, 18 insertions, 2 deletions
diff --git a/gui/src/renderer/components/AdvancedSettings.tsx b/gui/src/renderer/components/AdvancedSettings.tsx
index f5394a2520..34136eb2f4 100644
--- a/gui/src/renderer/components/AdvancedSettings.tsx
+++ b/gui/src/renderer/components/AdvancedSettings.tsx
@@ -41,6 +41,7 @@ interface IProps {
   setBlockWhenDisconnected: (value: boolean) => void;
   setOpenVpnMssfix: (value: number | undefined) => void;
   setRelayProtocolAndPort: (protocol?: RelayProtocol, port?: number) => void;
+  onViewWireguardKeys: () => void;
   onClose: () => void;
 }
 
@@ -255,6 +256,14 @@ export default class AdvancedSettings extends Component<IProps, IState> {
                       },
                     )}
                   </Cell.Footer>
+                  <View>
+                    <Cell.CellButton onPress={this.props.onViewWireguardKeys}>
+                      <Cell.Label>
+                        {messages.pgettext('advanced-settings-view', 'WireGuard keys')}
+                      </Cell.Label>
+                      <Cell.Icon height={12} width={7} source="icon-chevron" />
+                    </Cell.CellButton>
+                  </View>
                 </NavigationScrollbars>
               </View>
             </NavigationContainer>
diff --git a/gui/src/renderer/containers/AdvancedSettingsPage.tsx b/gui/src/renderer/containers/AdvancedSettingsPage.tsx
index a8784a62e2..bebcf0464b 100644
--- a/gui/src/renderer/containers/AdvancedSettingsPage.tsx
+++ b/gui/src/renderer/containers/AdvancedSettingsPage.tsx
@@ -1,4 +1,4 @@
-import { goBack } from 'connected-react-router';
+import { goBack, push } from 'connected-react-router';
 import log from 'electron-log';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
@@ -38,7 +38,7 @@ const mapRelaySettingsToProtocolAndPort = (relaySettings: RelaySettingsRedux) =>
 };
 
 const mapDispatchToProps = (dispatch: ReduxDispatch, props: ISharedRouteProps) => {
-  const history = bindActionCreators({ goBack }, dispatch);
+  const history = bindActionCreators({ push, goBack }, dispatch);
   return {
     onClose: () => {
       history.goBack();
@@ -98,6 +98,7 @@ const mapDispatchToProps = (dispatch: ReduxDispatch, props: ISharedRouteProps) =
         log.error('Failed to update mssfix value', e.message);
       }
     },
+    onViewWireguardKeys: () => history.push('/settings/advanced/wireguard-keys'),
   };
 };
 
diff --git a/gui/src/renderer/routes.tsx b/gui/src/renderer/routes.tsx
index ae694cefbc..814eeae31e 100644
--- a/gui/src/renderer/routes.tsx
+++ b/gui/src/renderer/routes.tsx
@@ -12,6 +12,7 @@ import PreferencesPage from './containers/PreferencesPage';
 import SelectLocationPage from './containers/SelectLocationPage';
 import SettingsPage from './containers/SettingsPage';
 import SupportPage from './containers/SupportPage';
+import WireguardKeysPage from './containers/WireguardKeysPage';
 import { getTransitionProps } from './transitions';
 
 export interface ISharedRouteProps {
@@ -90,6 +91,11 @@ class AppRoutes extends React.Component<IAppRoutesProps, IAppRoutesState> {
                 path="/settings/advanced"
                 component={AdvancedSettingsPage}
               />
+              <CustomRoute
+                exact={true}
+                path="/settings/advanced/wireguard-keys"
+                component={WireguardKeysPage}
+              />
               <CustomRoute exact={true} path="/settings/support" component={SupportPage} />
               <CustomRoute exact={true} path="/select-location" component={SelectLocationPage} />
             </Switch>