diff --git a/app/components/breadcrumb/index.js b/app/components/breadcrumb/index.js
index 3ed16442682cde376b72a6285c963ba976c875a6..c1b8d9f06707dc66c31d2232c8949eae6d24f9ee 100644
--- a/app/components/breadcrumb/index.js
+++ b/app/components/breadcrumb/index.js
@@ -18,10 +18,15 @@ export default class BreadcrumbComponent extends Component {
   }
 
   get query() {
-
     if (this.args.extranode) {
       return {
-        extranode_id: this.args.extranode.id
+        extra_id: this.args.extranode.id,
+        extra_type: 'folder'
+      }
+    } else if (this.args.extradoc) {
+      return {
+        extra_id: this.args.extradoc.id,
+        extra_type: 'doc'
       }
     }
 
diff --git a/app/components/dual_link_to/index.js b/app/components/dual_link_to/index.js
index f5b171868c5d684dc914a83c5e8500343531a04c..51b6fe451133c870ba1117aa424b5ecf585302b4 100644
--- a/app/components/dual_link_to/index.js
+++ b/app/components/dual_link_to/index.js
@@ -9,6 +9,7 @@ export default class DualLinkToComponent extends Component {
 
       @node - main node, which is visually located on left panel
       @extranode - extra node, visually on right panel
+      @extradoc - extra document on the right
       @hint = can be either "left" "right". Indicates in which panel
       is current <DualLinkTo /> located at this very moment.
 
@@ -115,11 +116,13 @@ export default class DualLinkToComponent extends Component {
   get query() {
     let node,
       extranode,
+      extradoc,
       hint,
       result = {};
 
     node = this.args.node;
     extranode = this.args.extranode;
+    extradoc = this.args.extradoc;
     hint = this.args.hint;
 
     if (this.args.query) {
@@ -127,17 +130,17 @@ export default class DualLinkToComponent extends Component {
     }
 
     if ((hint === 'left') && extranode) {
-      if (extranode.get('nodeType') === 'document') {
-        return {
-          'extra_id': extranode.get('id'),
-          'extra_type': 'doc'
-        };
-      } else if (extranode.get('nodeType') === 'folder') {
-        return {
-          'extra_id': extranode.get('id'),
-          'extra_type': 'folder'
-        };
-      }
+      return {
+        'extra_id': extranode.get('id'),
+        'extra_type': 'folder'
+      };
+    }
+
+    if ((hint === 'left') && extradoc) {
+      return {
+        'extra_id': extradoc.get('id'),
+        'extra_type': 'doc'
+      };
     }
 
     if (hint === 'right' && node) {
diff --git a/app/components/viewer/index.hbs b/app/components/viewer/index.hbs
index 879576fa202f4c30862ec196e6c81599060a9333..db0f1d15d23fb71ce6d89f7794f185a6576d655d 100644
--- a/app/components/viewer/index.hbs
+++ b/app/components/viewer/index.hbs
@@ -15,6 +15,7 @@
   <Breadcrumb
     @node={{@doc}}
     @extranode={{@extranode}}
+    @extradoc={{@extradoc}}
     @hint={{@hint}} />
 
   <div class="d-flex">
diff --git a/app/templates/authenticated/document.hbs b/app/templates/authenticated/document.hbs
index 3d551f08803d0e0d7fc42b0874c7184229355934..ea82c27482da7a6edd8b5c84eca94e1413ddb3d9 100644
--- a/app/templates/authenticated/document.hbs
+++ b/app/templates/authenticated/document.hbs
@@ -2,7 +2,8 @@
   <Viewer
     @doc={{@model.doc}}
     @pages={{@model.pages}}
-    @extranode={{this.extranode.current_node}}
+    @extranode={{@model.extra.current_node}}
+    @extradoc={{@mode.extra.doc}}
     @onPanelToggle={{this.onPanelToggle}}
     @dualPanelMode={{this.dualpanel_mode}}
     @hint="left" />
@@ -12,7 +13,8 @@
       <Viewer
         @doc={{@model.extra.doc}}
         @pages={{@model.extra.pages}}
-        @extranode={{this.extranode.current_node}}
+        @extranode={{@model.extra.current_node}}
+        @extradoc={{@model.doc}}
         @onPanelToggle={{this.onPanelToggle}}
         @dualPanelMode={{this.dualpanel_mode}}
         @hint="right" />
diff --git a/app/templates/authenticated/nodes.hbs b/app/templates/authenticated/nodes.hbs
index 4648f4b2fb6714eac3f5d72a8eb3d3e1fba733ad..4a04596473e02c3016546133710c0083d43c19c7 100644
--- a/app/templates/authenticated/nodes.hbs
+++ b/app/templates/authenticated/nodes.hbs
@@ -1,9 +1,11 @@
 <div class="panels d-flex row">
   <Commander
     @node={{@model.current_node}}
-    @extranode={{@model.extra.current_node}}
     @children={{@model.children}}
     @pagination={{@model.pagination}}
+    {{! extranode/extradoc are passed to breadcrumb and local dual links }}
+    @extranode={{@model.extra.current_node}}
+    @extradoc={{@model.extra.doc}}
     @onPanelToggle={{this.onPanelToggle}}
     @dualPanelMode={{this.dualpanel_mode}}
     @hint="left" />
@@ -20,9 +22,9 @@
     {{else}}
       <Commander
         @node={{@model.extra.current_node}}
-        @extranode={{@model.current_node}}
         @children={{@model.extra.children}}
         @pagination={{@model.extra.pagination}}
+        @extranode={{@model.current_node}}
         @onPanelToggle={{this.onPanelToggle}}
         @dualPanelMode={{this.dualpanel_mode}}
         @hint="right" />