diff --git a/ucSubmitNews.ascx b/ucSubmitNews.ascx
index 148802b..b55d51b 100755
--- a/ucSubmitNews.ascx
+++ b/ucSubmitNews.ascx
@@ -226,9 +226,8 @@
 		</tr>
 		<tr runat="Server" id="trTags">
 			<td class="SubHead" width="150"><dnn:label id="plTags" text="Tags:" runat="server" controlname="txtTags"></dnn:label></td>
-			<td>    
-			    <asp:textbox id="txtTags" cssclass="NormalTextBox" width="300" maxlength="255" runat="server" /><br />
-			    <asp:Label ID="lblTags" ResourceKey="TagsHelp" runat="server" CssClass="Normal" />
+			<td>
+				<asp:ListBox ID="lstTags" runat="server" CssClass="Normal" DataTextField="Name" DataValueField="Name" Width="300px" SelectionMode="Multiple" />
 			</td>
 		</tr>
 		</table>
diff --git a/ucSubmitNews.ascx.designer.vb b/ucSubmitNews.ascx.designer.vb
index bee8470..31aec3f 100755
--- a/ucSubmitNews.ascx.designer.vb
+++ b/ucSubmitNews.ascx.designer.vb
@@ -672,22 +672,13 @@ Namespace Ventrian.NewsArticles
         Protected WithEvents plTags As Global.System.Web.UI.UserControl
 
         '''<summary>
-        '''txtTags control.
+        '''lstTags control.
         '''</summary>
         '''<remarks>
         '''Auto-generated field.
         '''To modify move field declaration from designer file to code-behind file.
         '''</remarks>
-        Protected WithEvents txtTags As Global.System.Web.UI.WebControls.TextBox
-
-        '''<summary>
-        '''lblTags control.
-        '''</summary>
-        '''<remarks>
-        '''Auto-generated field.
-        '''To modify move field declaration from designer file to code-behind file.
-        '''</remarks>
-        Protected WithEvents lblTags As Global.System.Web.UI.WebControls.Label
+        Protected WithEvents lstTags As Global.System.Web.UI.WebControls.ListBox
 
         '''<summary>
         '''phPublish control.
diff --git a/ucSubmitNews.ascx.vb b/ucSubmitNews.ascx.vb
index 48f9f88..5ce4ca5 100755
--- a/ucSubmitNews.ascx.vb
+++ b/ucSubmitNews.ascx.vb
@@ -191,7 +191,8 @@ Namespace Ventrian.NewsArticles
                         li.Selected = True
                     End If
                 Next
-                txtTags.Text = objArticle.Tags
+
+                SelectTags(objArticle.Tags)
 
                 Dim objPageController As New PageController
                 Dim pages As ArrayList = objPageController.GetPageList(_articleID)
@@ -336,6 +337,31 @@ Namespace Ventrian.NewsArticles
 
         End Sub
 
+        Private Sub BindTags()
+            Dim objTagController As New TagController
+            Dim objTags As ArrayList = objTagController.List(ModuleId, Null.NullInteger)
+
+            objTags.Sort()
+            lstTags.DataSource = objTags
+            lstTags.DataBind()
+        End Sub
+
+        Private Sub SelectTags(ByVal tagList As String)
+            Dim objTagController As New TagController
+            For Each tag As String In tagList.Split(","c)
+                If (tag <> "") Then
+                    Dim objTag As TagInfo = objTagController.Get(ModuleId, tag)
+
+                    If Not (objTag Is Nothing) Then
+                        Dim li As ListItem = lstTags.Items.FindByValue(objTag.Name)
+                        If Not (li Is Nothing) Then
+                            li.Selected = True
+                        End If
+                    End If
+                End If
+            Next
+        End Sub
+
         Private Sub BindCustomFields()
 
             Dim objCustomFieldController As New CustomFieldController()
@@ -1145,31 +1171,22 @@ Namespace Ventrian.NewsArticles
                 Dim objLinkedArticle As ArticleInfo = objArticleController.GetArticle(Convert.ToInt32(drpMirrorArticle.SelectedValue))
 
                 If (objLinkedArticle IsNot Nothing) Then
-                    txtTags.Text = objLinkedArticle.Tags
+                    SelectTags(objLinkedArticle.Tags)
                 End If
             End If
 
             Dim objTagController As New TagController
             objTagController.DeleteArticleTag(articleID)
 
-            If (txtTags.Text <> "") Then
-                Dim tags As String() = txtTags.Text.Split(","c)
-                For Each tag As String In tags
-                    If (tag <> "") Then
-                        Dim objTag As TagInfo = objTagController.Get(ModuleId, tag)
-
-                        If (objTag Is Nothing) Then
-                            objTag = New TagInfo
-                            objTag.Name = tag
-                            objTag.NameLowered = tag.ToLower()
-                            objTag.ModuleID = ModuleId
-                            objTag.TagID = objTagController.Add(objTag)
-                        End If
+            For Each li As ListItem In lstTags.Items
+                If (li.Selected) Then
+                    Dim objTag As TagInfo = objTagController.Get(ModuleId, li.Value)
 
+                    If Not (objTag Is Nothing) Then
                         objTagController.Add(articleID, objTag.TagID)
                     End If
-                Next
-            End If
+                End If
+            Next
 
         End Sub
 
@@ -1517,6 +1534,7 @@ Namespace Ventrian.NewsArticles
 
                     BindStatus()
                     BindCategories()
+                    BindTags()
                     SetVisibility()
                     BindArticle()
                     SetValidationGroup()