diff --git a/Greenshot/Configuration/LanguageKeys.cs b/Greenshot/Configuration/LanguageKeys.cs
index e4f890dda..08458a185 100644
--- a/Greenshot/Configuration/LanguageKeys.cs
+++ b/Greenshot/Configuration/LanguageKeys.cs
@@ -137,6 +137,7 @@ namespace Greenshot.Configuration {
 		editor_undo,
 		editor_redo,
 		editor_insertwindow,
+		editor_resetsize,
 		error,
 		error_multipleinstances,
 		error_nowriteaccess,
diff --git a/Greenshot/Drawing/DrawableContainerList.cs b/Greenshot/Drawing/DrawableContainerList.cs
index 0ca5dac3d..955cae074 100644
--- a/Greenshot/Drawing/DrawableContainerList.cs
+++ b/Greenshot/Drawing/DrawableContainerList.cs
@@ -459,7 +459,7 @@ namespace Greenshot.Drawing {
 				}
 			}
 			if (canReset) {
-				item = new ToolStripMenuItem("Reset size");
+				item = new ToolStripMenuItem(Language.GetString(LangKey.editor_resetsize));
 				//item.Image = ((System.Drawing.Image)(editorFormResources.GetObject("removeObjectToolStripMenuItem.Image")));
 				item.Click += delegate {
 					foreach (DrawableContainer container in this) {
@@ -478,20 +478,18 @@ namespace Greenshot.Drawing {
 		}
 
 		public virtual void ShowContextMenu(MouseEventArgs e, Surface surface) {
-			if (conf.isExperimentalFeatureEnabled("Contextmenu")) {
-				bool hasMenu = false;
-				foreach (DrawableContainer container in this) {
-					if (container.hasContextMenu) {
-						hasMenu = true;
-						break;
-					}
+			bool hasMenu = false;
+			foreach (DrawableContainer container in this) {
+				if (container.hasContextMenu) {
+					hasMenu = true;
+					break;
 				}
-				if (hasMenu) {
-					ContextMenuStrip menu = new ContextMenuStrip();
-					AddContextMenuItems(menu, surface);
-					if (menu.Items.Count > 0) {
-						menu.Show(surface, e.Location);
-					}
+			}
+			if (hasMenu) {
+				ContextMenuStrip menu = new ContextMenuStrip();
+				AddContextMenuItems(menu, surface);
+				if (menu.Items.Count > 0) {
+					menu.Show(surface, e.Location);
 				}
 			}
 		}
diff --git a/Greenshot/Languages/language-en-US.xml b/Greenshot/Languages/language-en-US.xml
index 6658b5ea2..df0a01e8f 100644
--- a/Greenshot/Languages/language-en-US.xml
+++ b/Greenshot/Languages/language-en-US.xml
@@ -574,6 +574,9 @@ time, e.g. 11_58_32 (plus extension defined in the settings)
 	<resource name="editor_insertwindow">
 		Insert window
 	</resource>
+	<resource name="editor_resetsize">
+		Reset size
+	</resource>
 	<resource name="settings_waittime">
 		Milliseconds to wait before capture
 	</resource>
diff --git a/GreenshotPlugin/Core/CoreConfiguration.cs b/GreenshotPlugin/Core/CoreConfiguration.cs
index cf07fd9bb..33326adf5 100644
--- a/GreenshotPlugin/Core/CoreConfiguration.cs
+++ b/GreenshotPlugin/Core/CoreConfiguration.cs
@@ -179,7 +179,7 @@ namespace GreenshotPlugin.Core {
 		[IniProperty("TitleFixReplacer", Description="The replacements for the matchers.")]
 		public Dictionary<string, string> TitleFixReplacer;
 
-		[IniProperty("ExperimentalFeatures", Description="A list which allows us to enable certain experimental features", ExcludeIfNull=true)]
+		[IniProperty("ExperimentalFeatures", Description="A list of experimental features, this allows us to test certain features before releasing them.", ExcludeIfNull=true)]
 		public List<string> ExperimentalFeatures;
 		
 		/// <summary>