diff --git a/resources/scripts/components/server/files/FileEditContainer.tsx b/resources/scripts/components/server/files/FileEditContainer.tsx
index 87eda2eb5..1faf99e5a 100644
--- a/resources/scripts/components/server/files/FileEditContainer.tsx
+++ b/resources/scripts/components/server/files/FileEditContainer.tsx
@@ -32,6 +32,7 @@ export default () => {
 
     const id = ServerContext.useStoreState(state => state.server.data!.id);
     const uuid = ServerContext.useStoreState(state => state.server.data!.uuid);
+    const setDirectory = ServerContext.useStoreActions(actions => actions.files.setDirectory);
     const { addError, clearFlashes } = useFlash();
 
     let fetchFileContent: null | (() => Promise<string>) = null;
@@ -39,8 +40,9 @@ export default () => {
     useEffect(() => {
         if (action === 'new') return;
 
-        setLoading(true);
         setError('');
+        setLoading(true);
+        setDirectory(hash.replace(/^#/, '').split('/').filter(v => !!v).slice(0, -1).join('/'));
         getFileContents(uuid, hash.replace(/^#/, ''))
             .then(setContent)
             .catch(error => {
diff --git a/resources/scripts/components/server/files/FileManagerBreadcrumbs.tsx b/resources/scripts/components/server/files/FileManagerBreadcrumbs.tsx
index 1cdcb05a4..ba43dbd61 100644
--- a/resources/scripts/components/server/files/FileManagerBreadcrumbs.tsx
+++ b/resources/scripts/components/server/files/FileManagerBreadcrumbs.tsx
@@ -45,13 +45,15 @@ export default ({ withinFileEditor, isNewFile }: Props) => {
 
     return (
         <div css={tw`flex items-center text-sm mb-4 text-neutral-500`}>
-            {(files && files.length > 0 && !params?.action) &&
-            <FileActionCheckbox
-                type={'checkbox'}
-                css={tw`mx-4`}
-                checked={selectedFilesLength === (files ? files.length : -1)}
-                onChange={onSelectAllClick}
-            />
+            {(files && files.length > 0 && !params?.action) ?
+                <FileActionCheckbox
+                    type={'checkbox'}
+                    css={tw`mx-4`}
+                    checked={selectedFilesLength === (files ? files.length : -1)}
+                    onChange={onSelectAllClick}
+                />
+                :
+                <div css={tw`w-12`}/>
             }
             /<span css={tw`px-1 text-neutral-300`}>home</span>/
             <NavLink