diff --git a/frontend/src/components/dirent-grid-view/dirent-grid-item.js b/frontend/src/components/dirent-grid-view/dirent-grid-item.js
index 3c4e310595..596a80c661 100644
--- a/frontend/src/components/dirent-grid-view/dirent-grid-item.js
+++ b/frontend/src/components/dirent-grid-view/dirent-grid-item.js
@@ -9,7 +9,7 @@ const propTypes = {
   dirent: PropTypes.object.isRequired,
   onItemClick: PropTypes.func.isRequired,
   showImagePopup: PropTypes.func.isRequired,
-  onGridItemContextmenu: PropTypes.func.isRequired,
+  onGridItemContextMenu: PropTypes.func.isRequired,
   onGridItemClick: PropTypes.func.isRequired,
   activeDirent: PropTypes.object,
   onGridItemMouseDown: PropTypes.func,
@@ -43,14 +43,14 @@ class DirentGridItem extends React.Component {
     
     const dirent = this.props.dirent;
     if (this.props.dirent === this.props.activeDirent) {
-      this.setState({isGridSelected:false})
+      this.setState({isGridSelected: false});
       if (Utils.imageCheck(dirent.name)) {
         this.props.showImagePopup(dirent);
       } else {
         this.props.onItemClick(dirent);
       }
     } else {
-      this.setState({isGridSelected: true})
+      this.setState({isGridSelected: false});
       this.props.onGridItemClick(this.props.dirent)
     }
   }
@@ -123,9 +123,9 @@ class DirentGridItem extends React.Component {
     return fileUrl;
   }
 
-  onGridItemContextmenu = (event) => {
+  onGridItemContextMenu = (event) => {
     let dirent = this.props.dirent;
-    this.props.onGridItemContextmenu(event, dirent);
+    this.props.onGridItemContextMenu(event, dirent);
   }
    
   render() {
@@ -146,7 +146,7 @@ class DirentGridItem extends React.Component {
 
     return(
       <Fragment>
-        <li className="grid-item" onContextMenu={this.onGridItemContextmenu} onMouseDown={this.onGridItemMouseDown}>
+        <li className="grid-item" onContextMenu={this.onGridItemContextMenu} onMouseDown={this.onGridItemMouseDown}>
           <div 
             className={gridClass}
             draggable="true" 
diff --git a/frontend/src/components/dirent-grid-view/dirent-grid-view.js b/frontend/src/components/dirent-grid-view/dirent-grid-view.js
index bcfcb05f1a..770a78351e 100644
--- a/frontend/src/components/dirent-grid-view/dirent-grid-view.js
+++ b/frontend/src/components/dirent-grid-view/dirent-grid-view.js
@@ -354,13 +354,13 @@ class DirentGridView extends React.Component{
     }
   }
 
-  onGridContainContextMenu = (event) => {
+  onGridContainerContextMenu = (event) => {
       let id = "dirent-grid-container-menu"
       let menuList = [TextTranslation.NEW_FOLDER, TextTranslation.NEW_FILE];
       this.handleContextClick(event, id, menuList);
   }
 
-  onGridItemContextmenu = (event, dirent) => {
+  onGridItemContextMenu = (event, dirent) => {
     let id = 'grid-item-contextmenu';
     let menuList = this.getDirentItemMenuList(dirent, true);
     this.handleContextClick(event, id, menuList, dirent);
@@ -483,7 +483,7 @@ class DirentGridView extends React.Component{
   
     return (
       <Fragment>
-        <ul className="grid-view" onClick={this.gridContainerClick} onContextMenu={this.onGridContainContextMenu} onMouseDown={this.onGridContainerMouseDown}>
+        <ul className="grid-view" onClick={this.gridContainerClick} onContextMenu={this.onGridContainerContextMenu} onMouseDown={this.onGridContainerMouseDown}>
           {
             direntList.length !== 0 && direntList.map((dirent, index) => {
               return (
@@ -495,7 +495,7 @@ class DirentGridView extends React.Component{
                   onItemClick={this.props.onItemClick}
                   currentRepoInfo={this.props.currentRepoInfo}
                   showImagePopup={this.showImagePopup}
-                  onGridItemContextmenu={this.onGridItemContextmenu}
+                  onGridItemContextMenu={this.onGridItemContextMenu}
                   onItemMove={this.props.onItemMove}
                   onGridItemMouseDown={this.onGridItemMouseDown}
                   onGridItemClick={this.onGridItemClick}