diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.html b/ui/src/app/metadata/provider/container/provider-edit.component.html
index 0011e0ceb..514fc1c48 100644
--- a/ui/src/app/metadata/provider/container/provider-edit.component.html
+++ b/ui/src/app/metadata/provider/container/provider-edit.component.html
@@ -38,7 +38,7 @@
                 </button>
                 &nbsp;
                 <button class="btn btn-secondary"
-                    (click)="cancel()" aria-label="Cancel changes, go back to dashboard"
+                    (click)="cancel(provider.resourceId)" aria-label="Cancel changes, go back to dashboard"
                     role="button">
                     <translate-i18n key="action.cancel">Cancel</translate-i18n>
                 </button>
diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts b/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts
index a5601d594..81da40d38 100644
--- a/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts
+++ b/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts
@@ -104,10 +104,10 @@ describe('Provider Edit Component', () => {
     });
 
     describe('cancel method', () => {
-        it('should route to the metadata manager', () => {
+        it('should route to the provider', () => {
             spyOn(router, 'navigate');
             spyOn(app, 'clear');
-            app.cancel();
+            app.cancel('foo');
             expect(router.navigate).toHaveBeenCalled();
             expect(app.clear).toHaveBeenCalled();
         });
diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.ts b/ui/src/app/metadata/provider/container/provider-edit.component.ts
index c00da63e2..ef37af038 100644
--- a/ui/src/app/metadata/provider/container/provider-edit.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-edit.component.ts
@@ -90,9 +90,9 @@ export class ProviderEditComponent implements OnDestroy, CanComponentDeactivate
         this.store.dispatch(new UpdateProviderRequest(this.latest));
     }
 
-    cancel(): void {
+    cancel(id): void {
         this.clear();
-        this.router.navigate(['dashboard', 'metadata', 'manager', 'providers']);
+        this.router.navigate(['/', 'metadata', 'provider', id, 'configuration', 'options']);
     }
 
     canDeactivate(
diff --git a/ui/src/app/metadata/provider/container/provider-filter-list.component.html b/ui/src/app/metadata/provider/container/provider-filter-list.component.html
index 253674e20..f38e66d7b 100644
--- a/ui/src/app/metadata/provider/container/provider-filter-list.component.html
+++ b/ui/src/app/metadata/provider/container/provider-filter-list.component.html
@@ -24,7 +24,12 @@
                     </a>
                 </editor-nav>
             </div>
-            <div class="col-6 col-lg-12 order-2 text-right">
+            <div class="col-6 col-lg-12 order-2 text-right d-flex justify-content-end justify-content-lg-between">
+                <a class="btn btn-link"
+                    [routerLink]="['/', 'metadata', 'provider', (provider$ | async).resourceId, 'configuration', 'options']">
+                    <i class="fa fa-arrow-left" aria-hidden="true"></i>&nbsp;
+                    Return to Provider
+                </a>
                 <a [routerLink]="['../', 'filter', 'new']"
                     class="btn btn-success">
                     <i class="fa fa-plus-circle"></i>
diff --git a/ui/src/app/metadata/provider/effect/collection.effect.ts b/ui/src/app/metadata/provider/effect/collection.effect.ts
index 344cb4d1f..f319a3d20 100644
--- a/ui/src/app/metadata/provider/effect/collection.effect.ts
+++ b/ui/src/app/metadata/provider/effect/collection.effect.ts
@@ -136,7 +136,7 @@ export class CollectionEffects {
     createProviderSuccessRedirect$ = this.actions$.pipe(
         ofType<AddProviderSuccess>(ProviderCollectionActionTypes.ADD_PROVIDER_SUCCESS),
         map(action => action.payload),
-        tap(provider => this.navigateToProvider(provider.id))
+        tap(provider => this.navigateToProvider(provider.resourceId))
     );
 
     @Effect()