diff --git a/packages/client/src/components/panels/EditLinkPanel/StyledEditLinkPanel.js b/packages/client/src/components/panels/EditLinkPanel/StyledEditLinkPanel.js
index 7fd02a7b2e..742c67f381 100644
--- a/packages/client/src/components/panels/EditLinkPanel/StyledEditLinkPanel.js
+++ b/packages/client/src/components/panels/EditLinkPanel/StyledEditLinkPanel.js
@@ -44,7 +44,7 @@ const StyledEditLinkPanel = styled(ModalDialog)`
   }
 
   .modal-body {
-    padding: 0px 0px 8px;
+    padding: 0;
   }
 
   .field-label-icon {
@@ -55,7 +55,7 @@ const StyledEditLinkPanel = styled(ModalDialog)`
     padding: 4px 0px 0px;
 
     .edit-link_link-block {
-      padding: 0px 16px 20px 16px;
+      padding: 16px 16px 20px 16px;
 
       .edit-link-text {
         display: inline-flex;
diff --git a/packages/client/src/components/panels/EmbeddingPanel/StyledEmbeddingPanel.js b/packages/client/src/components/panels/EmbeddingPanel/StyledEmbeddingPanel.js
index 8a87b68cd9..b0f53dacfb 100644
--- a/packages/client/src/components/panels/EmbeddingPanel/StyledEmbeddingPanel.js
+++ b/packages/client/src/components/panels/EmbeddingPanel/StyledEmbeddingPanel.js
@@ -33,7 +33,7 @@ const StyledModalDialog = styled(ModalDialog)`
   }
 
   .modal-body {
-    padding: 0 0 8px;
+    padding: 0;
   }
 `;
 
diff --git a/packages/client/src/pages/Home/InfoPanel/Body/sub-components/Search.tsx b/packages/client/src/pages/Home/InfoPanel/Body/sub-components/Search.tsx
index 27563deafd..eb22d0d93d 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/sub-components/Search.tsx
+++ b/packages/client/src/pages/Home/InfoPanel/Body/sub-components/Search.tsx
@@ -75,6 +75,10 @@ const Search = ({ setSearchValue, resetSearch }: SearchProps) => {
     return () => window.removeEventListener("keyup", onEscapeUp);
   }, []);
 
+  useEffect(() => {
+    return () => debouncedSearch.cancel();
+  }, [debouncedSearch]);
+
   return (
     <StyledSearchContainer>
       <TextInput
diff --git a/packages/shared/components/modal-dialog/ModalDialog.styled.ts b/packages/shared/components/modal-dialog/ModalDialog.styled.ts
index e17e4132e2..cd923ac106 100644
--- a/packages/shared/components/modal-dialog/ModalDialog.styled.ts
+++ b/packages/shared/components/modal-dialog/ModalDialog.styled.ts
@@ -160,7 +160,6 @@ const StyledHeader = styled.div`
   align-items: center;
   border-bottom: ${(props) =>
     `1px solid ${props.theme.modalDialog.headerBorderColor}`};
-  margin-bottom: 16px;
   height: 52px;
   padding: 0 16px 0;
 
diff --git a/packages/shared/selectors/Files/hooks/useSocketHelper.ts b/packages/shared/selectors/Files/hooks/useSocketHelper.ts
index 4a0b0fe1f7..8dc0c98923 100644
--- a/packages/shared/selectors/Files/hooks/useSocketHelper.ts
+++ b/packages/shared/selectors/Files/hooks/useSocketHelper.ts
@@ -51,6 +51,8 @@ const useSocketHelper = ({
 }: UseSocketHelperProps) => {
   const { getIcon } = React.useContext(SettingsContext);
 
+  const initRef = React.useRef(false);
+
   const subscribedId = React.useRef<null | number>(null);
 
   const unsubscribe = React.useCallback(
@@ -281,6 +283,10 @@ const useSocketHelper = ({
   );
 
   React.useEffect(() => {
+    if (initRef.current) return;
+
+    initRef.current = true;
+
     socketHelper.on("s:modify-folder", (opt?: TOptSocket) => {
       switch (opt?.cmd) {
         case "create":