diff --git a/Greenshot/Destinations/PickerDestination.cs b/Greenshot/Destinations/PickerDestination.cs
index 4c699c37f..75631b219 100644
--- a/Greenshot/Destinations/PickerDestination.cs
+++ b/Greenshot/Destinations/PickerDestination.cs
@@ -92,6 +92,8 @@ namespace Greenshot.Destinations {
 						if (clickedDestination == null) {
 							return;
 						}
+						// Make sure the menu is closed
+						menu.Close();
 						bool result = clickedDestination.ExportCapture(surface, captureDetails);
 						// TODO: Find some better way to detect that we exported to the editor
 						if (!EditorDestination.DESIGNATION.Equals(clickedDestination.Designation) || result == false) {
@@ -99,8 +101,6 @@ namespace Greenshot.Destinations {
 							// Cleanup surface
 							surface.Dispose();
 						}
-						// Make sure the menu is closed
-						menu.Close();
 					}
 				);
 				if (item != null) {
diff --git a/GreenshotJiraPlugin/Forms/JiraForm.cs b/GreenshotJiraPlugin/Forms/JiraForm.cs
index 86f9d7cba..cb8545c21 100644
--- a/GreenshotJiraPlugin/Forms/JiraForm.cs
+++ b/GreenshotJiraPlugin/Forms/JiraForm.cs
@@ -53,9 +53,8 @@ namespace GreenshotJiraPlugin {
 			} catch (Exception e) {
 				MessageBox.Show(language.GetFormattedString(LangKey.login_error, e.Message));
 			}
-			updateForm();
-
 			uploadButton.Enabled = false;
+			updateForm();
 		}
 
 		private void initializeComponentText() {
@@ -74,7 +73,11 @@ namespace GreenshotJiraPlugin {
 					jiraFilterBox.SelectedIndex = 0;
 				}
 				changeModus(true);
-				jiraKey.Text = config.LastUsedJira;
+				selectedIssue = jiraConnector.getIssue(config.LastUsedJira);
+				if (selectedIssue != null) {
+					jiraKey.Text = config.LastUsedJira;
+					uploadButton.Enabled = true;
+				}
 			}
 		}
 
@@ -199,7 +202,7 @@ namespace GreenshotJiraPlugin {
 			// Perform the sort with these new sort options.
 			this.jiraListView.Sort();
 		}
-        
+
         void JiraKeyTextChanged(object sender, EventArgs e) {
 			string jiranumber = jiraKey.Text;
 			uploadButton.Enabled = false;