diff --git a/Forms/TextAreaForm.Designer.cs b/Forms/TextAreaForm.Designer.cs
index b68cab0..273934b 100644
--- a/Forms/TextAreaForm.Designer.cs
+++ b/Forms/TextAreaForm.Designer.cs
@@ -37,6 +37,7 @@
             TextEdit_TableLayoutPanel2 = new TableLayoutPanel();
             Okay_Button = new Button();
             Cancel_Button = new Button();
+            enableDisableWordWrapToolStripMenuItem = new ToolStripMenuItem();
             TextEdit_TableLayoutPanel1.SuspendLayout();
             TextEdit_ContextMenuStrip.SuspendLayout();
             TextEdit_TableLayoutPanel2.SuspendLayout();
@@ -72,14 +73,14 @@
             // TextEdit_ContextMenuStrip
             // 
             TextEdit_ContextMenuStrip.ImageScalingSize = new Size(32, 32);
-            TextEdit_ContextMenuStrip.Items.AddRange(new ToolStripItem[] { copyToClipboardToolStripMenuItem });
+            TextEdit_ContextMenuStrip.Items.AddRange(new ToolStripItem[] { copyToClipboardToolStripMenuItem, enableDisableWordWrapToolStripMenuItem });
             TextEdit_ContextMenuStrip.Name = "TextEdit_ContextMenuStrip";
-            TextEdit_ContextMenuStrip.Size = new Size(283, 42);
+            TextEdit_ContextMenuStrip.Size = new Size(388, 124);
             // 
             // copyToClipboardToolStripMenuItem
             // 
             copyToClipboardToolStripMenuItem.Name = "copyToClipboardToolStripMenuItem";
-            copyToClipboardToolStripMenuItem.Size = new Size(282, 38);
+            copyToClipboardToolStripMenuItem.Size = new Size(387, 38);
             copyToClipboardToolStripMenuItem.Text = "Copy to Clipboard";
             copyToClipboardToolStripMenuItem.Click += copyToClipboardToolStripMenuItem_Click;
             // 
@@ -119,6 +120,13 @@
             Cancel_Button.Text = "Cancel";
             Cancel_Button.UseVisualStyleBackColor = true;
             // 
+            // enableDisableWordWrapToolStripMenuItem
+            // 
+            enableDisableWordWrapToolStripMenuItem.Name = "enableDisableWordWrapToolStripMenuItem";
+            enableDisableWordWrapToolStripMenuItem.Size = new Size(387, 38);
+            enableDisableWordWrapToolStripMenuItem.Text = "Enable / Disable Word Wrap";
+            enableDisableWordWrapToolStripMenuItem.Click += enableDisableWordWrapToolStripMenuItem_Click;
+            // 
             // TextAreaForm
             // 
             AutoScaleDimensions = new SizeF(13F, 32F);
@@ -143,5 +151,6 @@
         private Button Cancel_Button;
         private ContextMenuStrip TextEdit_ContextMenuStrip;
         private ToolStripMenuItem copyToClipboardToolStripMenuItem;
+        private ToolStripMenuItem enableDisableWordWrapToolStripMenuItem;
     }
 }
\ No newline at end of file
diff --git a/Forms/TextAreaForm.cs b/Forms/TextAreaForm.cs
index 9131e4c..69e22e6 100644
--- a/Forms/TextAreaForm.cs
+++ b/Forms/TextAreaForm.cs
@@ -5,7 +5,7 @@ namespace newcle.us.Forms
 {
     public partial class TextAreaForm : Form
     {
-        public TextAreaForm() : this("Edit Content") { }
+        public TextAreaForm() : this("Untitled") { }
         public TextAreaForm(string formTitle)
         {
             InitializeComponent();
@@ -30,6 +30,9 @@ namespace newcle.us.Forms
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public string? RichText { get { return Content_RichTextBox.Rtf; } set { Content_RichTextBox.Rtf = value; } }
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool WordWrap { get { return Content_RichTextBox.WordWrap; } set { Content_RichTextBox.WordWrap = value; } }
+
         public void ReadOnly()
         {
             Content_RichTextBox.ReadOnly = true;
@@ -51,14 +54,21 @@ namespace newcle.us.Forms
             }
             catch (Exception ex)
             {
-                DialogExtensions.GenericError(String.Format($"Failed to open link: {ex.Message}"));
+                MessageBox.Show(String.Format($"Failed to open link: {ex.Message}"), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
 
         private void copyToClipboardToolStripMenuItem_Click(object sender, EventArgs e)
         {
+            if (string.IsNullOrEmpty(BasicText)) { return; }
+
             Clipboard.SetText(BasicText ?? "");
-            DialogExtensions.GenericSuccess("Content successfully copied to clipboard");
+            MessageBox.Show("Content successfully copied to clipboard", "Clipboard", MessageBoxButtons.OK, MessageBoxIcon.Information);
+        }
+
+        private void enableDisableWordWrapToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            Content_RichTextBox.WordWrap = !Content_RichTextBox.WordWrap;
         }
     }