diff --git a/GBM/Forms/frmFileFolderSearch.Designer.vb b/GBM/Forms/frmFileFolderSearch.Designer.vb
index 7b792a6..4f3ab2e 100644
--- a/GBM/Forms/frmFileFolderSearch.Designer.vb
+++ b/GBM/Forms/frmFileFolderSearch.Designer.vb
@@ -71,12 +71,12 @@ Partial Class frmFileFolderSearch
         '
         'lblResults
         '
-        Me.lblResults.AutoSize = True
         Me.lblResults.Location = New System.Drawing.Point(9, 36)
         Me.lblResults.Name = "lblResults"
-        Me.lblResults.Size = New System.Drawing.Size(45, 13)
+        Me.lblResults.Size = New System.Drawing.Size(463, 13)
         Me.lblResults.TabIndex = 1
-        Me.lblResults.Text = "Results:"
+        Me.lblResults.Text = "Search Results"
+        Me.lblResults.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
         'frmFileFolderSearch
         '
diff --git a/GBM/Forms/frmFileFolderSearch.vb b/GBM/Forms/frmFileFolderSearch.vb
index 10e1ffc..6bc475d 100644
--- a/GBM/Forms/frmFileFolderSearch.vb
+++ b/GBM/Forms/frmFileFolderSearch.vb
@@ -168,15 +168,17 @@ Public Class frmFileFolderSearch
     Private Sub EndSearch()
         Dim oResult As MsgBoxResult
 
-        If FoundItem = "Cancel" Then FoundItem = String.Empty
+        If Not bShutdown Then
+            If FoundItem = "Cancel" Then FoundItem = String.Empty
 
-        If oDrives.Count > iCurrentDrive And FoundItem = String.Empty Then
-            oResult = mgrCommon.ShowMessage(frmFileFolderSearch_SwitchDrives, New String() {oDrives(iCurrentDrive).RootDirectory.ToString}, MsgBoxStyle.YesNo)
-            If oResult = MsgBoxResult.Yes Then
-                Search(oDrives(iCurrentDrive))
+            If oDrives.Count > iCurrentDrive And FoundItem = String.Empty Then
+                oResult = mgrCommon.ShowMessage(frmFileFolderSearch_SwitchDrives, New String() {oDrives(iCurrentDrive).RootDirectory.ToString}, MsgBoxStyle.YesNo)
+                If oResult = MsgBoxResult.Yes Then
+                    Search(oDrives(iCurrentDrive))
+                End If
+            Else
+                SearchComplete()
             End If
-        Else
-            SearchComplete()
         End If
     End Sub
 
diff --git a/GBM/Forms/frmIncludeExclude.vb b/GBM/Forms/frmIncludeExclude.vb
index 827a346..154f6e6 100644
--- a/GBM/Forms/frmIncludeExclude.vb
+++ b/GBM/Forms/frmIncludeExclude.vb
@@ -335,6 +335,10 @@ Public Class frmIncludeExclude
 
     Private Sub lstBuilder_AfterLabelEdit(sender As Object, e As LabelEditEventArgs) Handles lstBuilder.AfterLabelEdit
         If Not e.Label Is Nothing Then
+            If e.Label = String.Empty Then
+                e.CancelEdit = True
+            End If
+
             If lstBuilder.Items.ContainsKey(e.Label) Then
                 e.CancelEdit = True
             Else
diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb
index a0c476b..4c3b60a 100644
--- a/GBM/My Project/Resources.Designer.vb	
+++ b/GBM/My Project/Resources.Designer.vb	
@@ -842,7 +842,7 @@ Namespace My.Resources
                 Return ResourceManager.GetString("frmFileFolderSearch_btnOk", resourceCulture)
             End Get
         End Property
-
+        
         '''<summary>
         '''  Looks up a localized string similar to Search.
         '''</summary>
@@ -851,16 +851,16 @@ Namespace My.Resources
                 Return ResourceManager.GetString("frmFileFolderSearch_FormName", resourceCulture)
             End Get
         End Property
-
+        
         '''<summary>
-        '''  Looks up a localized string similar to Results:.
+        '''  Looks up a localized string similar to Search Results.
         '''</summary>
         Friend ReadOnly Property frmFileFolderSearch_lblResults() As String
             Get
                 Return ResourceManager.GetString("frmFileFolderSearch_lblResults", resourceCulture)
             End Get
         End Property
-
+        
         '''<summary>
         '''  Looks up a localized string similar to Search Complete!.
         '''</summary>
@@ -869,7 +869,7 @@ Namespace My.Resources
                 Return ResourceManager.GetString("frmFileFolderSearch_SearchComplete", resourceCulture)
             End Get
         End Property
-
+        
         '''<summary>
         '''  Looks up a localized string similar to Do you wish to search the [PARAM] drive?.
         '''</summary>
@@ -878,7 +878,7 @@ Namespace My.Resources
                 Return ResourceManager.GetString("frmFileFolderSearch_SwitchDrives", resourceCulture)
             End Get
         End Property
-
+        
         '''<summary>
         '''  Looks up a localized string similar to &gt;.
         '''</summary>
diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx
index 3d1fb5d..c879fe8 100644
--- a/GBM/My Project/Resources.resx	
+++ b/GBM/My Project/Resources.resx	
@@ -1589,7 +1589,7 @@
     <value>&amp;OK</value>
   </data>
   <data name="frmFileFolderSearch_lblResults" xml:space="preserve">
-    <value>Results:</value>
+    <value>Search Results</value>
   </data>
   <data name="frmFileFolderSearch_SearchComplete" xml:space="preserve">
     <value>Search Complete!</value>