diff --git a/NanaZip.Core/SevenZip/CPP/7zip/UI/GUI/ExtractDialog.cpp b/NanaZip.Core/SevenZip/CPP/7zip/UI/GUI/ExtractDialog.cpp
index ad222b130..a7b16d907 100644
--- a/NanaZip.Core/SevenZip/CPP/7zip/UI/GUI/ExtractDialog.cpp
+++ b/NanaZip.Core/SevenZip/CPP/7zip/UI/GUI/ExtractDialog.cpp
@@ -192,19 +192,31 @@ bool CExtractDialog::OnInit()
   UString pathPrefix = DirPath;
 
   #ifndef Z7_SFX
-  
+
+  // **************** NanaZip Modification Start ****************
+  UString pathName;
+  SplitPathToParts_Smart(DirPath, pathPrefix, pathName);
+  if (pathPrefix.IsEmpty())
+    pathPrefix = pathName;
+  else
+    _pathName.SetText(pathName);
+
+  //if (_info.SplitDest.Val)
+  //{
+  //  CheckButton(IDX_EXTRACT_NAME_ENABLE, true);
+  //  UString pathName;
+  //  SplitPathToParts_Smart(DirPath, pathPrefix, pathName);
+  //  if (pathPrefix.IsEmpty())
+  //    pathPrefix = pathName;
+  //  else
+  //    _pathName.SetText(pathName);
+  //}
+
   if (_info.SplitDest.Val)
-  {
     CheckButton(IDX_EXTRACT_NAME_ENABLE, true);
-    UString pathName;
-    SplitPathToParts_Smart(DirPath, pathPrefix, pathName);
-    if (pathPrefix.IsEmpty())
-      pathPrefix = pathName;
-    else
-      _pathName.SetText(pathName);
-  }
   else
     ShowItem_Bool(IDE_EXTRACT_NAME, false);
+  // **************** NanaZip Modification End ****************
 
   #endif
 
diff --git a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/GUI/ExtractDialog.cpp b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/GUI/ExtractDialog.cpp
index 4cc73fe92..be6b2c446 100644
--- a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/GUI/ExtractDialog.cpp
+++ b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/GUI/ExtractDialog.cpp
@@ -188,18 +188,30 @@ bool CExtractDialog::OnInit()
 
   #ifndef _SFX
 
+  // **************** NanaZip Modification Start ****************
+  UString pathName;
+  SplitPathToParts_Smart(DirPath, pathPrefix, pathName);
+  if (pathPrefix.IsEmpty())
+    pathPrefix = pathName;
+  else
+    _pathName.SetText(pathName);
+
+  //if (_info.SplitDest.Val)
+  //{
+  //  CheckButton(IDX_EXTRACT_NAME_ENABLE, true);
+  //  UString pathName;
+  //  SplitPathToParts_Smart(DirPath, pathPrefix, pathName);
+  //  if (pathPrefix.IsEmpty())
+  //    pathPrefix = pathName;
+  //  else
+  //    _pathName.SetText(pathName);
+  //}
+
   if (_info.SplitDest.Val)
-  {
     CheckButton(IDX_EXTRACT_NAME_ENABLE, true);
-    UString pathName;
-    SplitPathToParts_Smart(DirPath, pathPrefix, pathName);
-    if (pathPrefix.IsEmpty())
-      pathPrefix = pathName;
-    else
-      _pathName.SetText(pathName);
-  }
   else
     ShowItem_Bool(IDE_EXTRACT_NAME, false);
+  // **************** NanaZip Modification End ****************
 
   #endif
 
diff --git a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/GUI/ExtractDialog.cpp b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/GUI/ExtractDialog.cpp
index 4cc73fe92..be6b2c446 100644
--- a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/GUI/ExtractDialog.cpp
+++ b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/GUI/ExtractDialog.cpp
@@ -188,18 +188,30 @@ bool CExtractDialog::OnInit()
 
   #ifndef _SFX
 
+  // **************** NanaZip Modification Start ****************
+  UString pathName;
+  SplitPathToParts_Smart(DirPath, pathPrefix, pathName);
+  if (pathPrefix.IsEmpty())
+    pathPrefix = pathName;
+  else
+    _pathName.SetText(pathName);
+
+  //if (_info.SplitDest.Val)
+  //{
+  //  CheckButton(IDX_EXTRACT_NAME_ENABLE, true);
+  //  UString pathName;
+  //  SplitPathToParts_Smart(DirPath, pathPrefix, pathName);
+  //  if (pathPrefix.IsEmpty())
+  //    pathPrefix = pathName;
+  //  else
+  //    _pathName.SetText(pathName);
+  //}
+
   if (_info.SplitDest.Val)
-  {
     CheckButton(IDX_EXTRACT_NAME_ENABLE, true);
-    UString pathName;
-    SplitPathToParts_Smart(DirPath, pathPrefix, pathName);
-    if (pathPrefix.IsEmpty())
-      pathPrefix = pathName;
-    else
-      _pathName.SetText(pathName);
-  }
   else
     ShowItem_Bool(IDE_EXTRACT_NAME, false);
+  // **************** NanaZip Modification End ****************
 
   #endif