diff --git a/html/file.html b/html/file.html
index 4d565302..7b957541 100644
--- a/html/file.html
+++ b/html/file.html
@@ -1 +1,8 @@
-<li draggable class><span class="mini-icon {type}"></span><span class=name><a href="{link}" title="{name}" draggable=true>{name}</a></span><span class=size>{size}</span><span class=owner>{owner}</span><span class=mode>{mode}</span></li>
\ No newline at end of file
+<li draggable class>
+    <span class="mini-icon {type}"></span>
+    <span class=name>
+        <a href="{link}" title="{name}" target="{target}" draggable=true>{name}</a>
+    </span>
+    <span class=size>{size}</span><span class=owner>{owner}</span>
+    <span class=mode>{mode}</span>
+</li>
\ No newline at end of file
diff --git a/html/path.html b/html/path.html
index a262144f..21fad940 100644
--- a/html/path.html
+++ b/html/path.html
@@ -1 +1,4 @@
-<li class=path><span class="path-icon clear-cache" id=clear-cache title="clear cache (Ctrl+D)"></span><span class="path-icon refresh-icon" title="refresh (Ctrl+R)"><a href="{link}"></a></span><span>{path}</span></li>
\ No newline at end of file
+<li class=path>
+    <span class="path-icon clear-cache" id=clear-cache title="clear cache (Ctrl+D)"></span><span class="path-icon refresh-icon" title="refresh (Ctrl+R)"><a href="{link}"></a></span>
+    <span>{path}</span>
+</li>
\ No newline at end of file
diff --git a/lib/client/dom.js b/lib/client/dom.js
index 9f112aab..af99b682 100644
--- a/lib/client/dom.js
+++ b/lib/client/dom.js
@@ -864,8 +864,10 @@ var CloudCommander, Util,
             var lCurrent;
             if(pPosition && pPosition.top)
                 lCurrent    = DOM.getRefreshButton().parentElement;
-            else
-                lCurrent    = DOM.getCurrentFile().firstChild.nextSibling;
+            else{
+                var lFile       = DOM.getCurrentFile();
+                lCurrent        = DOM.getByClass('name', lFile)[0];
+            }
             
             /* show loading icon if it not showed */
             
diff --git a/lib/cloudfunc.js b/lib/cloudfunc.js
index 47c5be37..c1f1abed 100644
--- a/lib/cloudfunc.js
+++ b/lib/cloudfunc.js
@@ -342,6 +342,7 @@ var CloudFunc, exports, Util;
             lFileTable += Util.render(pTemplate,{
                type     : 'directory',
                link     : lLink,
+               target   : '',
                name     : '..',
                size     : '&lt;dir&gt;',
                owner    : '.',
@@ -353,12 +354,13 @@ var CloudFunc, exports, Util;
             var lFile   = files[i];
             
             lFileTable += Util.render(pTemplate,{
-                type     : lFile.size === 'dir' ? 'directory' : 'text-file',
-                link     : FS + lPath + lFile.name,
-                name     : lFile.name,
-                size     : lFile.size === 'dir' ? '&lt;dir&gt;' : CloudFunc.getShortSize( lFile.size ),
-                owner    : !lFile.uid ? 'root' : lFile.uid,
-                mode     : CloudFunc.getSymbolicPermissions(lFile.mode)
+                type    : lFile.size === 'dir' ? 'directory' : 'text-file',
+                link    : FS + lPath + lFile.name,
+                target  : lFile.size === 'dir' ? '' : "_blank",
+                name    : lFile.name,
+                size    : lFile.size === 'dir' ? '&lt;dir&gt;' : CloudFunc.getShortSize( lFile.size ),
+                owner   : !lFile.uid ? 'root' : lFile.uid,
+                mode    : CloudFunc.getSymbolicPermissions(lFile.mode)
             });
         }