diff --git a/lib/client/viewer.js b/lib/client/viewer.js
index f3d61e1c..2b4649d8 100644
--- a/lib/client/viewer.js
+++ b/lib/client/viewer.js
@@ -68,10 +68,7 @@ CloudCommander.Viewer.FancyBox.set          = (function(){
         return;
     try{
         /* get current panel (left or right) */
-        var lPanel = this.getByClass('current-file');
-    
-        lPanel.length &&
-            (lPanel = lPanel[0].parentElement);
+        var lPanel = this.getPanel();
             
         /* get all file links */
         var lA = lPanel.getElementsByTagName('a');
@@ -96,12 +93,8 @@ CloudCommander.Viewer.FancyBox.set          = (function(){
 CloudCommander.Viewer.FancyBox.show         = (function(pParent){
     CloudCommander.Viewer.FancyBox.set();
     
-    var lCurrent = this.getByClass('current-file');
-          lCurrent.length &&
-            (lCurrent = lCurrent[0]);
-    
-    var lA = lCurrent.getElementsByClassName('fancybox');
-                        
+    var lCurrent = this.getCurrentFile();    
+    var lA = lCurrent.getElementsByClassName('fancybox');                        
     var lConfig = this.getConfig();
     
     lA.length &&