diff --git a/client/src/pages/Servers/Servers.jsx b/client/src/pages/Servers/Servers.jsx
index 7543fd6..8d31cd9 100644
--- a/client/src/pages/Servers/Servers.jsx
+++ b/client/src/pages/Servers/Servers.jsx
@@ -58,11 +58,17 @@ export const Servers = () => {
         setEditServerId(null);
     };
 
+    const closePVEDialog = () => {
+        setProxmoxDialogOpen(false);
+        setCurrentFolderId(null);
+        setEditServerId(null);
+    }
+
     return (
         <div className="server-page">
             <ServerDialog open={serverDialogOpen} onClose={closeDialog} currentFolderId={currentFolderId}
                           editServerId={editServerId} />
-            <ProxmoxDialog open={proxmoxDialogOpen} onClose={() => setProxmoxDialogOpen(false)}
+            <ProxmoxDialog open={proxmoxDialogOpen} onClose={closePVEDialog}
                            currentFolderId={currentFolderId}
                            editServerId={editServerId} />
             <ServerList setServerDialogOpen={() => setServerDialogOpen(true)} connectToServer={connectToServer}
diff --git a/client/src/pages/Servers/components/ProxmoxDialog/ProxmoxDialog.jsx b/client/src/pages/Servers/components/ProxmoxDialog/ProxmoxDialog.jsx
index 17381d6..18deb54 100644
--- a/client/src/pages/Servers/components/ProxmoxDialog/ProxmoxDialog.jsx
+++ b/client/src/pages/Servers/components/ProxmoxDialog/ProxmoxDialog.jsx
@@ -20,9 +20,9 @@ export const ProxmoxDialog = ({ open, onClose, currentFolderId, editServerId })
         putRequest("pve-servers", {
             name, folderId: currentFolderId, ip, port, username, password,
         }).then(async () => {
-            await postRequest("pve-servers/refresh");
-            loadServers();
             onClose();
+            loadServers();
+            await postRequest("pve-servers/refresh");
         }).catch(err => console.error(err));
     };
 
@@ -45,8 +45,14 @@ export const ProxmoxDialog = ({ open, onClose, currentFolderId, editServerId })
                 setUsername(server.username);
                 setPassword("********");
             }).catch(err => console.error(err));
+        } else {
+            setName("");
+            setIp("");
+            setPort("8006");
+            setUsername("");
+            setPassword("");
         }
-    }, [editServerId]);
+    }, [editServerId, open]);
 
     const { loadServers } = useContext(ServerContext);
 
diff --git a/client/src/pages/Servers/components/ViewContainer/components/ServerTabs/ServerTabs.jsx b/client/src/pages/Servers/components/ViewContainer/components/ServerTabs/ServerTabs.jsx
index f0d9963..a4c68e9 100644
--- a/client/src/pages/Servers/components/ViewContainer/components/ServerTabs/ServerTabs.jsx
+++ b/client/src/pages/Servers/components/ViewContainer/components/ServerTabs/ServerTabs.jsx
@@ -20,8 +20,8 @@ export const ServerTabs = ({activeSessions, setActiveSessionId, activeSessionId,
                     return (
                         <div key={session.id} className={"server-tab" + (session.id === activeSessionId ? " server-tab-active" : "")}
                                 onClick={() => setActiveSessionId(session.id)}>
-                            <Icon path={server.icon ? loadIcon(server.icon) : getIconByType(server.type)} />
-                            <h2>{server.name}</h2>
+                            <Icon path={server?.icon ? loadIcon(server.icon) : getIconByType(server?.type)} />
+                            <h2>{server?.name}</h2>
                             <Icon path={mdiClose} onClick={(e) => {
                                 e.stopPropagation();
                                 disconnectFromServer(session.id);