diff --git a/src/ServiceBusExplorer/Controls/TestQueueControl.Designer.cs b/src/ServiceBusExplorer/Controls/TestQueueControl.Designer.cs
index cbcbe73f..9d146034 100644
--- a/src/ServiceBusExplorer/Controls/TestQueueControl.Designer.cs
+++ b/src/ServiceBusExplorer/Controls/TestQueueControl.Designer.cs
@@ -329,6 +329,7 @@ private void InitializeComponent()
             this.messageTabControl.Size = new System.Drawing.Size(459, 366);
             this.messageTabControl.TabIndex = 0;
             this.messageTabControl.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.messageTabControl_DrawItem);
+            this.messageTabControl.Selected += messageTabControl_Selected;
             // 
             // tabMessagePage
             // 
@@ -589,6 +590,7 @@ private void InitializeComponent()
             this.messageFileListView.DrawItem += new System.Windows.Forms.DrawListViewItemEventHandler(this.messageFileListView_DrawItem);
             this.messageFileListView.DrawSubItem += new System.Windows.Forms.DrawListViewSubItemEventHandler(this.messageFileListView_DrawSubItem);
             this.messageFileListView.Resize += new System.EventHandler(this.messageFileListView_Resize);
+            this.messageFileListView.ItemChecked += messageFileListView_ItemCheckedChanged;
             // 
             // nameColumnHeader
             // 
diff --git a/src/ServiceBusExplorer/Controls/TestQueueControl.cs b/src/ServiceBusExplorer/Controls/TestQueueControl.cs
index f9490b37..378cb50d 100644
--- a/src/ServiceBusExplorer/Controls/TestQueueControl.cs
+++ b/src/ServiceBusExplorer/Controls/TestQueueControl.cs
@@ -1938,6 +1938,21 @@ private void messageTabControl_DrawItem(object sender, DrawItemEventArgs e)
             DrawTabControlTabs(messageTabControl, e, null);
         }
 
+        private void messageTabControl_Selected(object sender, System.Windows.Forms.TabControlEventArgs e)
+        {
+            if (messageTabControl.SelectedIndex == FilesTabPage)
+            {
+                var messageCount = messageFileListView.Items.Cast<ListViewItem>()
+                                .Count(i => i.Checked);
+
+                txtMessageCount.Text = messageCount.ToString();
+            }
+            else
+            {
+                txtMessageCount.Text = DefaultMessageCount;
+            }
+        }
+
         private void btnSelectFiles_Click(object sender, EventArgs e)
         {
             openFileDialog.Multiselect = true;
@@ -2028,7 +2043,18 @@ private void messageFileListView_DrawSubItem(object sender, DrawListViewSubItemE
         {
             e.DrawDefault = true;
         }
+        
+        private void messageFileListView_ItemCheckedChanged(object sender, System.Windows.Forms.ItemCheckedEventArgs e)
+        {
+            if (messageTabControl.SelectedIndex == FilesTabPage)
+            {
+                var messageCount = messageFileListView.Items.Cast<ListViewItem>()
+                            .Count(i => i.Checked);
 
+                txtMessageCount.Text = messageCount.ToString();
+            }
+        }
+        
         private void btnClearFiles_Click(object sender, EventArgs e)
         {
             checkBoxFileName.Checked = false;
diff --git a/src/ServiceBusExplorer/Controls/TestTopicControl.Designer.cs b/src/ServiceBusExplorer/Controls/TestTopicControl.Designer.cs
index 8f1a3542..d0c7cdaa 100644
--- a/src/ServiceBusExplorer/Controls/TestTopicControl.Designer.cs
+++ b/src/ServiceBusExplorer/Controls/TestTopicControl.Designer.cs
@@ -331,6 +331,7 @@ private void InitializeComponent()
             this.messageTabControl.Size = new System.Drawing.Size(459, 366);
             this.messageTabControl.TabIndex = 0;
             this.messageTabControl.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.messageTabControl_DrawItem);
+            this.messageTabControl.Selected += messageTabControl_Selected;
             // 
             // tabMessagePage
             // 
@@ -589,6 +590,8 @@ private void InitializeComponent()
             this.messageFileListView.DrawItem += new System.Windows.Forms.DrawListViewItemEventHandler(this.messageFileListView_DrawItem);
             this.messageFileListView.DrawSubItem += new System.Windows.Forms.DrawListViewSubItemEventHandler(this.messageFileListView_DrawSubItem);
             this.messageFileListView.Resize += new System.EventHandler(this.messageFileListView_Resize);
+            this.messageFileListView.ItemChecked += messageFileListView_ItemCheckedChanged;
+            
             // 
             // nameColumnHeader
             // 
@@ -2622,7 +2625,6 @@ private void InitializeComponent()
             this.ResumeLayout(false);
 
         }
-
         #endregion
 
         private System.Windows.Forms.Button btnStart;
diff --git a/src/ServiceBusExplorer/Controls/TestTopicControl.cs b/src/ServiceBusExplorer/Controls/TestTopicControl.cs
index 87c3448d..48eebfa6 100644
--- a/src/ServiceBusExplorer/Controls/TestTopicControl.cs
+++ b/src/ServiceBusExplorer/Controls/TestTopicControl.cs
@@ -1944,6 +1944,21 @@ private void messageTabControl_DrawItem(object sender, DrawItemEventArgs e)
             DrawTabControlTabs(messageTabControl, e, null);
         }
 
+        private void messageTabControl_Selected(object sender, System.Windows.Forms.TabControlEventArgs e)
+        {
+            if (messageTabControl.SelectedIndex == FilesTabPage)
+            {
+                var messageCount = messageFileListView.Items.Cast<ListViewItem>()
+                                .Count(i => i.Checked);
+
+                txtMessageCount.Text = messageCount.ToString();
+            }
+            else
+            {
+                txtMessageCount.Text = DefaultMessageCount;
+            }
+        }
+
         private void btnSelectFiles_Click(object sender, EventArgs e)
         {
             openFileDialog.Multiselect = true;
@@ -2034,6 +2049,17 @@ private void messageFileListView_DrawSubItem(object sender, DrawListViewSubItemE
             e.DrawDefault = true;
         }
 
+        private void messageFileListView_ItemCheckedChanged(object sender, System.Windows.Forms.ItemCheckedEventArgs e)
+        {
+            if (messageTabControl.SelectedIndex == FilesTabPage)
+            {
+                var messageCount = messageFileListView.Items.Cast<ListViewItem>()
+                            .Count(i => i.Checked);
+
+                txtMessageCount.Text = messageCount.ToString();
+            }
+        }
+
         private void btnClearFiles_Click(object sender, EventArgs e)
         {
             checkBoxFileName.Checked = false;