diff --git a/Filtration.Parser/Services/ItemFilterBlockTranslator.cs b/Filtration.Parser/Services/ItemFilterBlockTranslator.cs
index a568ed7..2d0e6ca 100644
--- a/Filtration.Parser/Services/ItemFilterBlockTranslator.cs
+++ b/Filtration.Parser/Services/ItemFilterBlockTranslator.cs
@@ -543,7 +543,7 @@ namespace Filtration.Parser.Services
 
             if (!string.IsNullOrEmpty(block.Description))
             {
-                outputString += "# " + block.Description + Environment.NewLine;
+                outputString += (block.Enabled ? "# " : "## ") + block.Description + Environment.NewLine;
             }
 
             outputString += (!block.Enabled ? "#" : string.Empty) + block.Action.GetAttributeDescription();
diff --git a/Filtration/ViewModels/ItemFilterScriptViewModel.cs b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
index f7d3418..9b41df8 100644
--- a/Filtration/ViewModels/ItemFilterScriptViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
@@ -778,6 +778,16 @@ namespace Filtration.ViewModels
 
         public void PasteBlock(IItemFilterBlockViewModelBase targetBlockViewModelBase)
         {
+            var commentBlock = targetBlockViewModelBase as IItemFilterCommentBlockViewModel;
+            if(commentBlock != null && !commentBlock.IsExpanded)
+            {
+                var blockIndex = ItemFilterBlockViewModels.IndexOf(targetBlockViewModelBase) + 1;
+                while (blockIndex < ItemFilterBlockViewModels.Count && (ItemFilterBlockViewModels[blockIndex] as IItemFilterCommentBlockViewModel) == null)
+                {
+                    blockIndex++;
+                }
+                targetBlockViewModelBase = ItemFilterBlockViewModels[blockIndex - 1];
+            }
             try
             {
                 var clipboardText = _clipboardService.GetClipboardText();
@@ -793,7 +803,20 @@ namespace Filtration.ViewModels
                 {
                     IItemFilterBlockBase translatedBlock;
                     var pastedDisabledBlock = false;
-                    if (!curBlock.StartsWith(@"#Disabled Block Start") && curBlock.StartsWith(@"#"))
+                    var isCommentBlock = !curBlock.StartsWith(@"#Disabled Block Start");
+                    string[] textLines = curBlock.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
+                    foreach(var line in textLines)
+                    {
+                        if(!line.StartsWith(@"#"))
+                        {
+                            isCommentBlock = false;
+                        }
+
+                        if (!isCommentBlock)
+                            break;
+                    }
+
+                    if (isCommentBlock)
                     {
                         translatedBlock = _blockTranslator.TranslateStringToItemFilterCommentBlock(curBlock, Script);
                         pastedSection = true;
@@ -801,7 +824,6 @@ namespace Filtration.ViewModels
                     else if (curBlock.StartsWith(@"#Disabled Block Start"))
                     {
                         pastedDisabledBlock = true;
-                        string[] textLines = curBlock.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
                         if (textLines.Length < 3)
                             continue;