diff --git a/client/modules/IDE/components/FileNode.jsx b/client/modules/IDE/components/FileNode.jsx
index 252de291..4fbc6ca1 100644
--- a/client/modules/IDE/components/FileNode.jsx
+++ b/client/modules/IDE/components/FileNode.jsx
@@ -156,7 +156,6 @@ export class FileNode extends React.Component {
                   ref={(element) => { this[`fileOptions-${this.props.id}`] = element; }}
                   tabIndex="0"
                   onClick={this.toggleFileOptions}
-                  onBlur={() => setTimeout(this.hideFileOptions, 200)}
                 >
                   <InlineSVG src={downArrowUrl} />
                 </button>
@@ -168,7 +167,10 @@ export class FileNode extends React.Component {
                           <li>
                             <button
                               aria-label="add file"
-                              onClick={this.props.newFile}
+                              onClick={() => {
+                                this.props.newFile();
+                                setTimeout(() => this.hideFileOptions(), 0);
+                              }}
                               className="sidebar__file-item-option"
                             >
                               Add File
@@ -183,7 +185,10 @@ export class FileNode extends React.Component {
                           <li>
                             <button
                               aria-label="add folder"
-                              onClick={this.props.newFolder}
+                              onClick={() => {
+                                this.props.newFolder();
+                                setTimeout(() => this.hideFileOptions(), 0);
+                              }}
                               className="sidebar__file-item-option"
                             >
                               Add Folder
@@ -198,6 +203,7 @@ export class FileNode extends React.Component {
                           this.originalFileName = this.props.name;
                           this.showEditFileName();
                           setTimeout(() => this.fileNameInput.focus(), 0);
+                          setTimeout(() => this.hideFileOptions(), 0);
                         }}
                         className="sidebar__file-item-option"
                       >
@@ -213,6 +219,9 @@ export class FileNode extends React.Component {
                             setTimeout(() => this.props.deleteFile(this.props.id, this.props.parentId), 100);
                           }
                         }}
+                        onBlur={() => {
+                          setTimeout(this.hideFileOptions, 200);
+                        }}
                         className="sidebar__file-item-option"
                       >
                         Delete
diff --git a/client/modules/IDE/components/Sidebar.jsx b/client/modules/IDE/components/Sidebar.jsx
index 6419abe1..b1fc82ea 100644
--- a/client/modules/IDE/components/Sidebar.jsx
+++ b/client/modules/IDE/components/Sidebar.jsx
@@ -65,18 +65,30 @@ class Sidebar extends React.Component {
               tabIndex="0"
               ref={(element) => { this.sidebarOptions = element; }}
               onClick={this.toggleProjectOptions}
-              onBlur={() => setTimeout(this.props.closeProjectOptions, 200)}
             >
               <InlineSVG src={downArrowUrl} />
             </button>
             <ul className="sidebar__project-options">
               <li>
-                <button aria-label="add folder" onClick={this.props.newFolder} >
+                <button
+                  aria-label="add folder"
+                  onClick={() => {
+                    this.props.newFolder();
+                    setTimeout(this.props.closeProjectOptions, 0);
+                  }}
+                >
                   Add folder
                 </button>
               </li>
               <li>
-                <button aria-label="add file" onClick={this.props.newFile} >
+                <button
+                  aria-label="add file"
+                  onClick={() => {
+                    this.props.newFile();
+                    setTimeout(this.props.closeProjectOptions, 0);
+                  }}
+                  onBlur={() => { setTimeout(this.props.closeProjectOptions, 200); }}
+                >
                   Add file
                 </button>
               </li>
diff --git a/server/controllers/project.controller.js b/server/controllers/project.controller.js
index 9244c270..ef9e0ef9 100644
--- a/server/controllers/project.controller.js
+++ b/server/controllers/project.controller.js
@@ -110,7 +110,9 @@ export function getProject(req, res) {
 function deleteFilesFromS3(files) {
   deleteObjectsFromS3(files.filter((file) => {
     if (file.url) {
-      if (!process.env.S3_DATE || (process.env.S3_DATE && isBefore(new Date(process.env.S3_DATE), new Date(file.createdAt)))) {
+      if (!process.env.S3_DATE || (
+        process.env.S3_DATE &&
+        isBefore(new Date(process.env.S3_DATE), new Date(file.createdAt)))) {
         return true;
       }
     }