diff --git a/lib/client.js b/lib/client.js
index 23021ce7..07ba5008 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -279,7 +279,7 @@ var Util, DOM, CloudFunc, $, KeyBinding, CloudCommander;
                 CloudCmd.Editor,            /* f4 */
                 DOM.copyCurrent,            /* f5 */
                 DOM.moveCurrent,            /* f6 */
-                DOM.promptNewFolder,        /* f7 */
+                DOM.promptNewDir,           /* f7 */
                 DOM.promptDeleteCurrent,    /* f8 */
             ];
         
diff --git a/lib/client/dom.js b/lib/client/dom.js
index e988e0fb..8b756ff7 100644
--- a/lib/client/dom.js
+++ b/lib/client/dom.js
@@ -148,19 +148,26 @@ var CloudCommander, Util, DOM = {}, CloudFunc;
         var lRet;
         
         if(pElement){
-            var lClassList = pElement.classList;
+            var lClassList  = pElement.classList;
+            lRet            = !DOM.isContainClass(pElement, pClass);
             
-            if(lClassList){
-                lRet = !lClassList.contains(pClass);
-                
-                if( lRet )
-                    lClassList.add(pClass);
-            }
+            if( lRet )
+                lClassList.add(pClass);
         }
         
         return lRet;
     };
     
+    DOM.isContainClass          = function(pElement, pClass){
+        var lRet,
+            lClassList = pElement && pElement.classList;
+            
+        if( lClassList )
+            lRet = lClassList.contains(pClass);
+            
+        return lRet;
+    };
+    
     /**
      * safe add event listener
      * 
@@ -405,7 +412,7 @@ var CloudCommander, Util, DOM = {}, CloudFunc;
      *
      * @pCurrentFile
      */
-    DOM.promptNewFolder         = function(){
+    DOM.promptNewDir        = function(){
         DOM.promptNewFile('directory', '?dir');
     };
     
@@ -414,7 +421,7 @@ var CloudCommander, Util, DOM = {}, CloudFunc;
      *
      * @pCurrentFile
      */
-    DOM.promptNewFile         = function(pTypeName, pType){
+    DOM.promptNewFile       = function(pTypeName, pType){
         var lName   = DOM.getCurrentName(),
             lDir    = DOM.getCurrentDirPath(),
             lMsg    = 'New ' + pTypeName || 'File',
@@ -1237,11 +1244,13 @@ var CloudCommander, Util, DOM = {}, CloudFunc;
      * 
      * @param pCurrentFile
      */
-    DOM.isCurrentFile           = function(pCurrentFile){
-        var lClass      = pCurrentFile && pCurrentFile.className,
-            lIsCurrent  = lClass && lClass.indexOf(CURRENT_FILE) >= 0;
+    DOM.isCurrentFile           = function(pCurrent){
+        var lRet;
         
-        return lIsCurrent;
+        if( pCurrent )
+            lRet = DOM.isContainClass(pCurrent, CURRENT_FILE);
+        
+        return lRet;
     };
     
     /**
@@ -1250,10 +1259,12 @@ var CloudCommander, Util, DOM = {}, CloudFunc;
      * @param pCurrentFile
      */
     DOM.isSelected              = function(pSelected){
-        var lClass      = pSelected && pSelected.className,
-            lIsSelected  = lClass && lClass.indexOf(SELECTED_FILE) >= 0;
+        var lRet;
         
-        return lIsSelected;
+        if( pSelected )
+            lRet = DOM.isContainClass(pSelected, SELECTED_FILE);
+        
+        return lRet;
     };
     
     /**
diff --git a/lib/client/keyBinding.js b/lib/client/keyBinding.js
index aa1f0e55..1e3b9802 100644
--- a/lib/client/keyBinding.js
+++ b/lib/client/keyBinding.js
@@ -168,7 +168,7 @@ var CloudCommander, Util, DOM;
                                 break;
                             
                             case KEY.F7:
-                                DOM.promptNewFolder();
+                                DOM.promptNewDir();
                                 break;
                             
                             case KEY.F:
diff --git a/lib/client/menu.js b/lib/client/menu.js
index 44995921..3f5c5e14 100644
--- a/lib/client/menu.js
+++ b/lib/client/menu.js
@@ -168,7 +168,7 @@ var CloudCommander, Util, DOM, CloudFunc, $;
         
         lMenuItems.New = {
             'File'          : DOM.promptNewFile,
-            'Dir'           : DOM.promptNewFolder,
+            'Dir'           : DOM.promptNewDir,
             
             'From cloud...' : function(){
                 CloudCmd.execFromModule('FilePicker', 'saveFile', function(pName, pData){