diff --git a/src/containers/SkynetExport/SkynetExport.css b/src/containers/SkynetExport/SkynetExport.css
index b1db5c3..67cec0d 100644
--- a/src/containers/SkynetExport/SkynetExport.css
+++ b/src/containers/SkynetExport/SkynetExport.css
@@ -2,3 +2,20 @@
   text-align: center;
   padding-bottom: var(--default_spacing);
 }
+
+.SkynetExportList {
+  display: inline-block;
+  width: 100%;
+  overflow-x: auto;
+  overflow-y: auto;
+  height: calc(90vh - 80px);
+}
+
+.SkynetExportTree {
+  display: inline-flex;
+  overflow-x: scroll;
+  overflow-y: scroll;
+  white-space: nowrap;
+  height: calc(90vh - 80px);
+  width: 100%;
+}
diff --git a/src/containers/SkynetExport/SkynetExport.js b/src/containers/SkynetExport/SkynetExport.js
index f86a423..3eaf747 100644
--- a/src/containers/SkynetExport/SkynetExport.js
+++ b/src/containers/SkynetExport/SkynetExport.js
@@ -155,7 +155,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(class extends IPCCon
         </div>
         <h1
           className={'SkynetExportHeading'}>{this.state.second_stage ? 'Verify Exports' : 'Export Files'}</h1>
-        <div style={{overflowX: 'auto', overflowY: 'auto', height: 'calc(90vh - 80px)'}}>
+        <div className={this.state.second_stage ? 'SkynetExportList' : 'SkynetExportTree'}>
           {
             this.state.second_stage ?
               this.state.checked.map(path => {
diff --git a/src/helpers.js b/src/helpers.js
index b8e655b..04bac4a 100644
--- a/src/helpers.js
+++ b/src/helpers.js
@@ -70,7 +70,13 @@ const _createTreeNodes = fileList => {
   };
 
   const addNode = obj => {
-    const fullPath = path.join(obj.directory, obj.filename).replace(/\\/g, '/');
+    let fullPath;
+    const idx = obj.skylink.indexOf('/');
+    if (idx > -1) {
+      fullPath = path.join(obj.directory, obj.skylink.substr(idx + 1)).replace(/\\/g, '/');
+    } else {
+      fullPath = path.join(obj.directory, obj.filename).replace(/\\/g, '/');
+    }
     const pathParts = fullPath.replace(/^\/|\/$/g, '').split('/');
     let ptr = tree;
     for (let i = 0; i < pathParts.length; i++) {