diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Controls/KDialogButtons.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Controls/KDialogButtons.cs
index fea3a5f..16609e7 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Controls/KDialogButtons.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Controls/KDialogButtons.cs
@@ -69,8 +69,8 @@ namespace Acacia.Controls
 
             buttonApply.Enabled = IsDirty;
             buttonApply.Visible = _hasApply;
-            buttonClose.Visible = !IsDirty || !_hasApply;
-            buttonCancel.Visible = IsDirty && !_hasApply;
+            buttonClose.Visible = !IsDirty;
+            buttonCancel.Visible = IsDirty;
 
             KDialogNew dlg = FindForm() as KDialogNew;
             if (dlg != null)
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/StoreTreeNode.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/StoreTreeNode.cs
index b841161..e478ab0 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/StoreTreeNode.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/StoreTreeNode.cs
@@ -100,7 +100,7 @@ namespace Acacia.Features.SharedFolders
 
             // Default include the store name in root folders
             if (folder.ParentId.IsNone)
-                share = share.WithName(folder.Store.UserName + " - " + folder.Name);
+                share = share.WithName(folder.Name + " - " + folder.Store.UserName);
 
             return share;
         }