diff --git a/src/app/system/configurations/global-configurations-tab/edit-configuration/edit-configuration.component.html b/src/app/system/configurations/global-configurations-tab/edit-configuration/edit-configuration.component.html
index 30b449999..2e8863434 100644
--- a/src/app/system/configurations/global-configurations-tab/edit-configuration/edit-configuration.component.html
+++ b/src/app/system/configurations/global-configurations-tab/edit-configuration/edit-configuration.component.html
@@ -26,7 +26,7 @@
       </mat-card-content>
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
-        <button type="button" mat-raised-button [routerLink]="['../../']"> Cancel </button>
+        <button type="button" mat-raised-button [routerLink]="['../..']"> Cancel </button>
         <button mat-raised-button color="primary" [disabled]="configurationForm.pristine || !configurationForm.valid">
           Submit </button>
       </mat-card-actions>
diff --git a/src/app/system/system-routing.module.ts b/src/app/system/system-routing.module.ts
index ff590036b..3f3257af2 100644
--- a/src/app/system/system-routing.module.ts
+++ b/src/app/system/system-routing.module.ts
@@ -87,6 +87,7 @@ import { ViewHistorySchedulerJobComponent } from './manage-scheduler-jobs/view-h
 import { ViewHistorySchedulerJobsResolver } from './manage-scheduler-jobs/view-history-scheduler-job/view-history-scheduler-job.resolver';
 import { ConfigurationsComponent } from './configurations/configurations.component';
 import { GlobalConfigurationResolver } from './configurations/global-configurations-tab/global-configuration.resolver';
+import { EditConfigurationComponent } from './configurations/global-configurations-tab/edit-configuration/edit-configuration.component';
 
 const routes: Routes = [
   Route.withShell([
@@ -456,8 +457,22 @@ const routes: Routes = [
         },
         {
           path: 'configurations',
-          component: ConfigurationsComponent,
-          data: { title: extract('Configurations'), breadcrumb: 'Configurations' }
+          data: { title: extract('Configurations'), breadcrumb: 'Configurations' },
+          children: [
+            {
+              path: '',
+              component: ConfigurationsComponent,
+              resolve: {}
+            },
+            {
+              path: ':id/edit',
+              data: { title: extract('Edit Configuration'), routeParamBreadcrumb: 'id' },
+              component: EditConfigurationComponent,
+              resolve: {
+                configuration: GlobalConfigurationResolver
+              }
+            }
+          ]
         },
         {
           path: 'account-number-preferences',