diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69b25f6f..6cc73f47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 #### Changed
 
-* *Nothing*
+* [#218](https://github.com/shlinkio/shlink-web-client/issues/218) Added back button to sections not displayed in left menu
 
 #### Deprecated
 
diff --git a/src/servers/EditServer.js b/src/servers/EditServer.js
index 6a6b89b6..33560631 100644
--- a/src/servers/EditServer.js
+++ b/src/servers/EditServer.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { Button } from 'reactstrap';
 import NoMenuLayout from '../common/NoMenuLayout';
 import { ServerForm } from './helpers/ServerForm';
 import { withSelectedServer } from './helpers/withSelectedServer';
@@ -10,11 +11,12 @@ const propTypes = {
   selectedServer: serverType,
   history: PropTypes.shape({
     push: PropTypes.func,
+    goBack: PropTypes.func,
   }),
 };
 
 export const EditServer = (ServerError) => {
-  const EditServerComp = ({ editServer, selectedServer, history: { push } }) => {
+  const EditServerComp = ({ editServer, selectedServer, history: { push, goBack } }) => {
     const handleSubmit = (serverData) => {
       editServer(selectedServer.id, serverData);
       push(`/server/${selectedServer.id}/list-short-urls/1`);
@@ -23,7 +25,8 @@ export const EditServer = (ServerError) => {
     return (
       <NoMenuLayout>
         <ServerForm initialValues={selectedServer} onSubmit={handleSubmit}>
-          <button className="btn btn-outline-primary">Save</button>
+          <Button outline className="mr-2" onClick={goBack}>Cancel</Button>
+          <Button outline color="primary">Save</Button>
         </ServerForm>
       </NoMenuLayout>
     );