diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
index 6c3fc2e4..fa55aa45 100644
--- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs
+++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
@@ -1049,7 +1049,9 @@ namespace Volian.Controls.Library
 				else if (ctrl is ComboBox)
 				{
 					ComboBox cmb = ctrl as ComboBox;
-					if (myDO.GetDataPresent(DataFormats.Text))
+					if (myDO.GetDataPresent(DataFormats.UnicodeText))
+						cmb.SelectedText = myDO.GetData(DataFormats.UnicodeText).ToString();
+					else if (myDO.GetDataPresent(DataFormats.Text))
 						cmb.SelectedText = myDO.GetData(DataFormats.Text).ToString();
 					_PastePlainText = false;
 					return;
@@ -1137,6 +1139,8 @@ namespace Volian.Controls.Library
 			Control ctrl = FindActiveControl();
 			if (ctrl == null) return; // null if on property page for procedure & section number/title
 			Clipboard.Clear();
+			if (_MyStepRTB.SelectedText == null || _MyStepRTB.SelectedText == "")
+				return; // nothing to copy onto clipboard, just return
 			DataObject myDO = new DataObject(); ;
 			if (ctrl is RichTextBox)
 			{