diff --git a/Greenshot/Forms/ImageEditorForm.Designer.cs b/Greenshot/Forms/ImageEditorForm.Designer.cs
index 972f9e596..f3aa65116 100644
--- a/Greenshot/Forms/ImageEditorForm.Designer.cs
+++ b/Greenshot/Forms/ImageEditorForm.Designer.cs
@@ -1580,7 +1580,6 @@ namespace Greenshot {
 			this.ClientSize = new System.Drawing.Size(785, 485);
 			this.Controls.Add(this.toolStripContainer1);
 			this.KeyPreview = true;
-			this.ManualLanguageApply = true;
 			this.LanguageKey = "editor_title";
 			this.Name = "ImageEditorForm";
 			this.Activated += new System.EventHandler(this.ImageEditorFormActivated);
diff --git a/Greenshot/Forms/ImageEditorForm.cs b/Greenshot/Forms/ImageEditorForm.cs
index 176519305..5ecf4c1d2 100644
--- a/Greenshot/Forms/ImageEditorForm.cs
+++ b/Greenshot/Forms/ImageEditorForm.cs
@@ -94,7 +94,8 @@ namespace Greenshot {
 			//
 			// The InitializeComponent() call is required for Windows Forms designer support.
 			//
-			InitializeComponent();
+            this.ManualLanguageApply = true;
+            InitializeComponent();
 			updateUI();
 			
 			this.Load += delegate {
@@ -768,7 +769,9 @@ namespace Greenshot {
 			this.redoToolStripMenuItem.Enabled = canRedo;
 			string redoAction = "";
 			if (canRedo) {
-				redoAction = Language.GetString(surface.RedoActionKey);
+                if (surface.RedoActionKey != LangKey.none) {
+                    redoAction = Language.GetString(surface.RedoActionKey);
+                }
 			}
 			string redoText = Language.GetFormattedString(LangKey.editor_redo, redoAction);
 			this.btnRedo.Text = redoText;