diff --git a/demo-shell-ng2/app/app.routes.ts b/demo-shell-ng2/app/app.routes.ts
index c2bea7144d..feaa94f7c0 100644
--- a/demo-shell-ng2/app/app.routes.ts
+++ b/demo-shell-ng2/app/app.routes.ts
@@ -28,6 +28,7 @@ import {
     AboutComponent,
     FormViewer
 } from './components/index';
+import { FormNodeViewer } from './components/activiti/form-node-viewer.component';
 
 export const routes: RouterConfig = [
     { path: 'home', component: FilesComponent },
@@ -39,6 +40,7 @@ export const routes: RouterConfig = [
     { path: 'search', component: SearchComponent },
     { path: 'activiti', component: ActivitiDemoComponent },
     { path: 'activiti/tasks/:id', component: FormViewer },
+    { path: 'activiti/tasksnode/:id', component: FormNodeViewer },
     { path: 'webscript', component: WebscriptComponent },
     { path: 'about', component: AboutComponent }
 ];
diff --git a/demo-shell-ng2/app/components/activiti/form-node-viewer.component.css b/demo-shell-ng2/app/components/activiti/form-node-viewer.component.css
new file mode 100644
index 0000000000..0e5cdfdd65
--- /dev/null
+++ b/demo-shell-ng2/app/components/activiti/form-node-viewer.component.css
@@ -0,0 +1,3 @@
+.activiti-form-viewer {
+    margin: 10px;
+}
diff --git a/demo-shell-ng2/app/components/activiti/form-node-viewer.component.html b/demo-shell-ng2/app/components/activiti/form-node-viewer.component.html
new file mode 100644
index 0000000000..e2f166282b
--- /dev/null
+++ b/demo-shell-ng2/app/components/activiti/form-node-viewer.component.html
@@ -0,0 +1,6 @@
+<div class="activiti-form-viewer" *ngIf="nodeId">
+    <activiti-form [nodeId]="nodeId"
+                   [saveMetadata]="true"
+                   [path]="'/Sites/swsdp/documentLibrary'">
+    </activiti-form>
+</div>
diff --git a/demo-shell-ng2/app/components/activiti/form-node-viewer.component.ts b/demo-shell-ng2/app/components/activiti/form-node-viewer.component.ts
new file mode 100644
index 0000000000..1b5f994660
--- /dev/null
+++ b/demo-shell-ng2/app/components/activiti/form-node-viewer.component.ts
@@ -0,0 +1,62 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Component, OnInit, OnDestroy, AfterViewChecked } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ActivitiForm, FormService, EcmModelService, NodeService } from 'ng2-activiti-form';
+import { Subscription } from 'rxjs/Rx';
+
+declare let __moduleName: string;
+declare var componentHandler;
+
+@Component({
+    moduleId: __moduleName,
+    selector: 'form-node-viewer',
+    templateUrl: './form-node-viewer.component.html',
+    styleUrls: ['./form-node-viewer.component.css'],
+    directives: [ActivitiForm],
+    providers: [FormService, EcmModelService, NodeService]
+})
+export class FormNodeViewer implements OnInit, OnDestroy, AfterViewChecked {
+
+    nodeId: string;
+
+    private sub: Subscription;
+
+    constructor(private formService: FormService,
+                private route: ActivatedRoute,
+                private router: Router) {
+    }
+
+    ngOnInit() {
+        this.sub = this.route.params.subscribe(params => {
+            this.nodeId = params['id'];
+        });
+    }
+
+    ngOnDestroy() {
+        this.sub.unsubscribe();
+    }
+
+    ngAfterViewChecked() {
+        // workaround for MDL issues with dynamic components
+        if (componentHandler) {
+            componentHandler.upgradeAllRegistered();
+        }
+    }
+
+}
diff --git a/demo-shell-ng2/app/components/files/files.component.html b/demo-shell-ng2/app/components/files/files.component.html
index 26cb8e4673..fabeb89aef 100644
--- a/demo-shell-ng2/app/components/files/files.component.html
+++ b/demo-shell-ng2/app/components/files/files.component.html
@@ -92,7 +92,7 @@
                         handler="delete">
                 </content-action>
                 <content-action
-                        target="document"
+                        target="folder"
                         title="Activiti: View Form"
                         (execute)="viewActivitiForm($event)">
                 </content-action>
diff --git a/demo-shell-ng2/app/components/files/files.component.ts b/demo-shell-ng2/app/components/files/files.component.ts
index 32dcb35b62..c6d8e3fad9 100644
--- a/demo-shell-ng2/app/components/files/files.component.ts
+++ b/demo-shell-ng2/app/components/files/files.component.ts
@@ -133,7 +133,7 @@ export class FilesComponent implements OnInit {
     }
 
     viewActivitiForm(event?: any) {
-        this.router.navigate(['/activiti/tasks', '1']);
+        this.router.navigate(['/activiti/tasksnode', event.value.entry.id]);
     }
 
     private setupBpmActions(actions: any[]) {