diff --git a/lib/client/listeners.js b/lib/client/listeners.js
index b6cd3b18..9415c510 100644
--- a/lib/client/listeners.js
+++ b/lib/client/listeners.js
@@ -204,9 +204,8 @@ var Util, DOM, CloudCmd;
                 link);
         }
         
-        function setCurrentFile(event, callback) {
-            var element     = event.target,
-                tag         = element.tagName;
+        function getLIElement(element) {
+            var tag         = element.tagName;
             
             if (tag !== 'LI')
                 do {
@@ -214,6 +213,13 @@ var Util, DOM, CloudCmd;
                     tag         = element.tagName;
                 } while(tag !== 'LI');
             
+            return element;
+        }
+        
+        
+        function setCurrentFile(event, callback) {
+            var element = getLIElement(event.target);
+            
             if (callback) 
                 Util.exec(callback, element);
             else
@@ -247,7 +253,6 @@ var Util, DOM, CloudCmd;
                 i               = 0,
                 n               = panels.length,
                 preventDefault  = function (event) {
-                    event.stopPropagation();
                     event.preventDefault();
                 },
                 toggle          = function () {