diff --git a/src/KeePassOTPExt.cs b/src/KeePassOTPExt.cs
index 1a9c5d0..f3a8168 100644
--- a/src/KeePassOTPExt.cs
+++ b/src/KeePassOTPExt.cs
@@ -219,7 +219,9 @@ private void OnEntryContextMenuOpening(object sender, EventArgs e)
 			m_ContextMenuCopy.ShowShortcutKeys = true;
 			m_ContextMenuCopy.ShortcutKeyDisplayString = UIUtil.GetKeysName(m_MainMenuCopy.ShortcutKeys);
 			var iSelectedEntries = m_host.MainWindow.GetSelectedEntriesCount();
-			if (m_host.MainWindow.GetSelectedEntriesCount() != 1)
+			SetEnabled(iSelectedEntries != 0, m_ContextMenu, m_MainMenu);
+			if (iSelectedEntries == 0) return;
+			else if (iSelectedEntries > 1)
 			{
 				SetEnabled(false, m_ContextMenuAutotype, m_MainMenuAutotype, m_ContextMenuCopy, m_ContextMenuSetup, m_MainMenuCopy, m_MainMenuSetup);
 				bool bEnableQR = false;
diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
index d15b732..5c6dd3c 100644
--- a/src/Properties/AssemblyInfo.cs
+++ b/src/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6")]
-[assembly: AssemblyFileVersion("1.6")]
+[assembly: AssemblyVersion("1.6.1")]
+[assembly: AssemblyFileVersion("1.6.1")]
diff --git a/version.info b/version.info
index ad3df70..7f50865 100644
--- a/version.info
+++ b/version.info
@@ -1,5 +1,5 @@
 :
-KeePassOTP:1.6
+KeePassOTP:1.6.1
 KeePassOTP!de:23
 KeePassOTP!fr:7
 KeePassOTP!nl:3