diff --git a/app/routes/deployments/single.js b/app/routes/deployments/single.js
index 1a2b8a4747256b4a64332db3f5f4fe5fe0805783..82d600017509792fffc5c15a6f66e5891419a79e 100644
--- a/app/routes/deployments/single.js
+++ b/app/routes/deployments/single.js
@@ -49,7 +49,10 @@ export default Ember.Route.extend({
             entityType,
             entityId
         });
-        this.transitionTo(url);
+        this.replaceWith(url);
+    },
+    backToSystem() {
+        this.replaceWith(this.get('routeName'));
     },
     willTransition(transition) {
         this.debug('transition', transition.targetName, this.get('routeName'));
diff --git a/app/styles/components/_architecture.scss b/app/styles/components/_architecture.scss
index e29fa4c3f2df5b42d35c0be3d2b3b0dddfaaf69b..229e0b94f28badcf8c002b68beaae69bd5633be7 100644
--- a/app/styles/components/_architecture.scss
+++ b/app/styles/components/_architecture.scss
@@ -14,8 +14,8 @@ $resizingAnimationDuration: .5s; // see deployments/detail route for property
     transition: width $resizingAnimationDuration;
 }
 
-.minimizeSidebar {
-    visibility: hidden;
+button.minimizeSidebar {
+    display: none;
 }
 .extendedSidebar { // TODO: not set by route?
     .visualisationContainer {
@@ -24,8 +24,8 @@ $resizingAnimationDuration: .5s; // see deployments/detail route for property
     .visualisationSidebar {
         @extend .col-md-4
     }
-    .minimizeSidebar {
-        visibility: visible;
+    button.minimizeSidebar {
+        display: inline-block;
     }
 }
 
diff --git a/app/templates/components/architecture-viewer.hbs b/app/templates/components/architecture-viewer.hbs
index 21d572f0da15df6d84a2c3581078aebee52ed87c..6f2110150617cf90cda38ba920b6e691fb972652 100644
--- a/app/templates/components/architecture-viewer.hbs
+++ b/app/templates/components/architecture-viewer.hbs
@@ -4,7 +4,7 @@
     </div>
     <div class="visualisationSidebar">
 
-        <button class="btn btn-default minimizeSidebar">
+        <button class="btn btn-default minimizeSidebar" {{action (route-action 'backToSystem')}}>
             <i class="glyphicon glyphicon-chevron-right"></i>
         </button>