diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index 59d0e4c..456c767 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -4,8 +4,6 @@ import { useOpenFiles } from "@/hooks/useOpenFiles"
 export function Header() {
   const { currentOpenFile } = useOpenFiles()
 
-  const openFileName = currentOpenFile()
-
   return (
     <div className="flex items-center justify-between px-3">
       <div className="flex items-center gap-2">
@@ -14,7 +12,7 @@ export function Header() {
         <button type="button" className="w-3 h-3 bg-[#61C554] rounded-full" />
       </div>
       <span className="text-[#908caa] text-sm">
-        {openFileName && `${openFileName.title} — `}fala-dev
+        {currentOpenFile && `${currentOpenFile.title} — `}fala-dev
       </span>
       <div className="w-14">&nbsp;</div>
     </div>
diff --git a/src/components/OpenFilesTabs/CloseFileButton.tsx b/src/components/OpenFilesTabs/CloseFileButton.tsx
index a08686a..f724e70 100644
--- a/src/components/OpenFilesTabs/CloseFileButton.tsx
+++ b/src/components/OpenFilesTabs/CloseFileButton.tsx
@@ -30,10 +30,8 @@ export function CloseFileButton({ isActive, index }: CloseFileButtonProps) {
   }
 
   return (
-    <a
-      onClick={(e) => {
-        e.preventDefault();
-        e.stopPropagation();
+    <button
+      onClick={() => {
         closeFile(index);
       }}
       className="w-[20px] h-[20px] flex justify-center items-center rounded hover:bg-[#817c9c26]"
@@ -43,6 +41,6 @@ export function CloseFileButton({ isActive, index }: CloseFileButtonProps) {
         className="data-[active=true]:text-white"
         size={16}
       />
-    </a>
+    </button>
   )
 }
diff --git a/src/components/OpenFilesTabs/index.tsx b/src/components/OpenFilesTabs/index.tsx
index 050c89d..7fdd9d1 100644
--- a/src/components/OpenFilesTabs/index.tsx
+++ b/src/components/OpenFilesTabs/index.tsx
@@ -16,11 +16,7 @@ export function OpenFilesTabs() {
         const isActive = pathName === openFile;
 
         const file = explorerFiles[openFile];
-
-        if (!file) {
-          return <></>;
-        }
-
+        
         return (
           <div
             key={index}
diff --git a/src/hooks/useOpenFiles.tsx b/src/hooks/useOpenFiles.tsx
index 4972ad2..bdea6f9 100644
--- a/src/hooks/useOpenFiles.tsx
+++ b/src/hooks/useOpenFiles.tsx
@@ -1,6 +1,5 @@
 "use client";
-import { createContext, useContext, useEffect, useState } from "react";
-import { LinkProps } from "next/link";
+import { createContext, useContext, useMemo, useState } from "react";
 import { usePathname } from "next/navigation";
 import { explorerFiles, FileType } from "@/components/Explorer";
 
@@ -8,7 +7,7 @@ type OpenFilesContextProps = {
   openFiles: string[];
   markFileAsOpen: (tab: string) => void;
   closeFile: (tabIndex: number) => void;
-  currentOpenFile: () => FileType | null;
+  currentOpenFile: FileType | null;
 };
 
 const OpenFilesContext = createContext({} as OpenFilesContextProps);
@@ -16,12 +15,9 @@ const OpenFilesContext = createContext({} as OpenFilesContextProps);
 export function OpenFilesProvider({ children }: { children: React.ReactNode }) {
   const pathName = usePathname();
 
-  const [openFiles, setOpenFiles] = useState<string[]>(() => {
-    if (pathName) {
-      const openTab = explorerFiles[pathName];
-      if (openTab) {
-        return [pathName];
-      }
+  const [openFiles, setOpenFiles] = useState<Array<keyof typeof explorerFiles>>(() => {
+    if (pathName && pathName !== '/') {
+      return [pathName];
     }
 
     return [];
@@ -32,7 +28,7 @@ export function OpenFilesProvider({ children }: { children: React.ReactNode }) {
       return;
     }
 
-    setOpenFiles([...openFiles, file]);
+    setOpenFiles(state => [...state, file]);
   };
 
   const closeFile = (fileIndex: number) => {
@@ -40,13 +36,15 @@ export function OpenFilesProvider({ children }: { children: React.ReactNode }) {
     setOpenFiles(newOpenFiles);
   };
 
-  const currentOpenFile = () => {
+  const currentOpenFile = useMemo(() => {
     const openFileHref = openFiles.find((openFile) => pathName === openFile);
+  
     if (openFileHref) {
       return explorerFiles[openFileHref];
     }
+    
     return null;
-  };
+  }, [openFiles, pathName])
 
   return (
     <OpenFilesContext.Provider