diff --git a/frontend/src/packages/dashboard/components/FileRenderer/FolderContainer.tsx b/frontend/src/packages/dashboard/components/FileRenderer/FolderContainer.tsx
index 85f1a79f..7722c44a 100644
--- a/frontend/src/packages/dashboard/components/FileRenderer/FolderContainer.tsx
+++ b/frontend/src/packages/dashboard/components/FileRenderer/FolderContainer.tsx
@@ -54,7 +54,6 @@ export default function FolderContainer({
     console.log(id);
     dispatch(traverseIntoFolder(id));
   };
-
   return (
     <IconContainer>
       <FolderIcon
diff --git a/frontend/src/packages/dashboard/components/FileRenderer/Renamable.tsx b/frontend/src/packages/dashboard/components/FileRenderer/Renamable.tsx
index 55abe4b7..efeb3338 100644
--- a/frontend/src/packages/dashboard/components/FileRenderer/Renamable.tsx
+++ b/frontend/src/packages/dashboard/components/FileRenderer/Renamable.tsx
@@ -17,7 +17,7 @@ interface Props {
 
 export default function Renamable({ name, id }: Props) {
   const [toggle, setToggle] = useState(true);
-  const [inputName, setInputName] = useState(name);
+  const [inputName, setInputName] = useState<string>(name);
 
   const dispatch = useDispatch();
 
@@ -30,7 +30,12 @@ export default function Renamable({ name, id }: Props) {
   return (
     <>
       {toggle ? (
-        <div onDoubleClick={() => setToggle(false)}>{name}</div>
+        <div onDoubleClick={() => {
+          setToggle(false);
+          // required as browser doesn't update inputName
+          // after first refresh of page after renaming
+          setInputName(name); 
+        }}>{name}</div>
       ) : (
         <input
           style={{
diff --git a/frontend/src/packages/dashboard/components/FileRenderer/Renderer.tsx b/frontend/src/packages/dashboard/components/FileRenderer/Renderer.tsx
index 546c1e9e..a7b31a19 100644
--- a/frontend/src/packages/dashboard/components/FileRenderer/Renderer.tsx
+++ b/frontend/src/packages/dashboard/components/FileRenderer/Renderer.tsx
@@ -4,6 +4,7 @@ import { RootState } from 'src/redux-state/reducers';
 import { folderSelectors } from '../../state/folders/index';
 import FileContainer from './FileContainer';
 import FolderContainer from './FolderContainer';
+import { FileEntity } from '../../state/folders/types';
 
 type Props = {
   selectedFile: string | null;
@@ -17,8 +18,29 @@ export default function Renderer({ selectedFile, setSelectedFile }: Props) {
 
   const folderItems = folders.items;
 
-  const renderItems = () =>
-    folderItems.map((item, index) => {
+  // folderItems
+
+  const fileComparator = (a : FileEntity, b : FileEntity) => {
+    if (a.type === b.type) {
+      return (
+        a.name.toLowerCase() < b.name.toLowerCase() 
+        ? -1
+        : ( a.name.toLowerCase() > b.name.toLowerCase() 
+            ? 1 
+            : 0
+          )
+        );
+    } else if (a.type === "File") {
+      return 1
+    }
+    return -1;
+  };
+
+  const renderItems = () => 
+
+  [...folderItems]
+  .sort(fileComparator)
+  .map((item, index) => {
       switch (item.type) {
         case 'Folder':
           return (
diff --git a/frontend/src/packages/dashboard/state/folders/reducers.ts b/frontend/src/packages/dashboard/state/folders/reducers.ts
index ecb8ad6d..0e4459ab 100644
--- a/frontend/src/packages/dashboard/state/folders/reducers.ts
+++ b/frontend/src/packages/dashboard/state/folders/reducers.ts
@@ -58,6 +58,7 @@ export function renameFileEntity(
   state: sliceState,
   action: PayloadAction<RenamePayloadType>
 ) {
+
   const { id, newName } = action.payload;
   return {
     ...state,