diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml
index 28c21e505e..05c931dbc7 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml
@@ -9,14 +9,14 @@
 
 	<optionpanels:ProjectOptionPanel.Resources>
 		<local:StringToBoolConverter x:Key="strToBool"></local:StringToBoolConverter>
+		<optionpanels:StorageLocationConverter x:Key="locationConverter" />
 	</optionpanels:ProjectOptionPanel.Resources>
 	
 	<ScrollViewer VerticalScrollBarVisibility="Auto">
-		
 		<StackPanel
 			Orientation="Vertical">
-			<GroupBox
-				Header="{core:Localize Dialog.ProjectOptions.Signing.StrongName}">
+			<GroupBox Header="{core:Localize Dialog.ProjectOptions.Signing.StrongName}">
+				
 				<Grid>
 					<Grid.RowDefinitions>
 						<RowDefinition Height="30"></RowDefinition>
@@ -31,60 +31,57 @@
 						<ColumnDefinition Width="*"></ColumnDefinition>
 					</Grid.ColumnDefinitions>
 					
-					<CheckBox x:Name="signAssemblyCheckBox"
-					          Grid.Column="1" VerticalAlignment="Bottom"
+					<CheckBox x:Name="signAssemblyCheckBox" Grid.Column="1" VerticalAlignment="Bottom"
 					          Content="{core:Localize Dialog.ProjectOptions.Signing.SignAssembly}"
 					          IsChecked="{Binding SignAssembly.Value}">
 					</CheckBox>
 					
 					<Label Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"
-					       Content="{core:Localize Dialog.ProjectOptions.Signing.ChooseKeyFile}"></Label>
-					
-					<optionpanels:StorageLocationPicker
-						Grid.Row="2"></optionpanels:StorageLocationPicker>
+					       Content="{core:Localize Dialog.ProjectOptions.Signing.ChooseKeyFile}">
+					</Label>
 					
-					<ComboBox
-						x:Name="keyFileComboBox"
-						Grid.Row="2"
-						Grid.Column="1"
-						VerticalAlignment="Center"
-						Margin="3,3,3,3"
-						IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}"
-						ItemsSource="{Binding KeyFile}"
-						SelectedValue="{Binding Path=SelectedKey}">
+					<optionpanels:StorageLocationPicker Grid.Row="2">
+						<optionpanels:StorageLocationPicker.Location>
+							<MultiBinding Converter="{StaticResource locationConverter}">
+								<Binding Path="SignAssembly.Location" />
+								<Binding Path="AssemblyOriginatorKeyFile.Location" />
+								<Binding Path="DelaySign.Location" />
+							</MultiBinding>
+						</optionpanels:StorageLocationPicker.Location>
+					</optionpanels:StorageLocationPicker>
+						
+					<ComboBox x:Name="keyFileComboBox" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Margin="3,3,3,3"
+					          IsEditable="True"
+					          IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}"
+					          ItemsSource="{Binding KeyFile}"
+					          Text="{Binding AssemblyOriginatorKeyFile.Value,UpdateSourceTrigger=PropertyChanged}"
+					          SelectedValue="{Binding Path=SelectedKey}">
 					</ComboBox>
 					
-					<Button
-						x:Name="changePasswordButton"
-						Grid.Row="2"
-						Grid.Column="3"
-						VerticalAlignment="Center"
-						IsEnabled="False"
-						Content="{core:Localize Dialog.ProjectOptions.Signing.ChangePassword}"
-						Margin="10,3,10,3"></Button>
+					<Button Grid.Row="2" Grid.Column="3" VerticalAlignment="Center" Margin="10,3,10,3"
+					        IsEnabled="False"
+					        Content="{core:Localize Dialog.ProjectOptions.Signing.ChangePassword}">
+					</Button>
 					
-					<CheckBox
-						x:Name="delaySignOnlyCheckBox"
-						Grid.Row="3"
-						Grid.Column="1"
-						VerticalAlignment="Center"
-						IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}"
-						Content="{core:Localize Dialog.ProjectOptions.Signing.DelaySignOnly}"
-						IsChecked="{Binding DelaySign.Value,Converter={StaticResource strToBool}}">
+					<CheckBox x:Name="delaySignOnlyCheckBox" Grid.Row="3" Grid.Column="1" VerticalAlignment="Center"
+					          IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}"
+					          Content="{core:Localize Dialog.ProjectOptions.Signing.DelaySignOnly}"
+					          IsChecked="{Binding DelaySign.Value,Converter={StaticResource strToBool}}">
 					</CheckBox>
 					
-					<Label
-						Grid.Row="4"
-						Grid.Column="1" VerticalAlignment="Center"
+					<Label Grid.Row="4" Grid.Column="1" VerticalAlignment="Center"
 						IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}"
-						Content="{core:Localize Dialog.ProjectOptions.Signing.DelaySignWarning}"></Label>
+						Content="{core:Localize Dialog.ProjectOptions.Signing.DelaySignWarning}">
+					</Label>
+				
 				</Grid>
+			
 			</GroupBox>
-			<GroupBox
-				Header="{core:Localize Dialog.ProjectOptions.Signing.ClickOnce}"
-				Margin="0,20,0,0">
+			
+			<GroupBox Margin="0,20,0,0" Header="{core:Localize Dialog.ProjectOptions.Signing.ClickOnce}">
 				<Label Content="{core:Localize Dialog.ProjectOptions.Signing.ClickOnceNotSupported}"></Label>
 			</GroupBox>
+		
 		</StackPanel>
 	</ScrollViewer>
 </optionpanels:ProjectOptionPanel>
\ No newline at end of file
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml.cs
index 0d0025d953..19aba5945d 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml.cs
@@ -44,6 +44,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 			keyFile.Add(StringParser.Parse("<${res:Global.BrowseText}...>"));
 			keyFileComboBox.SelectedIndex = 0;
 			keyFileComboBox.SelectionChanged += KeyFileComboBox_SelectionChanged;
+			IsDirty = false;
 		}
 		
 		public ProjectProperty<bool> SignAssembly {
@@ -75,6 +76,13 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 		
 		protected override bool Save(MSBuildBasedProject project, string configuration, string platform)
 		{
+			/*
+			helper.Saved += delegate {
+				if (Get<CheckBox>("signAssembly").Checked) {
+					helper.SetProperty("AssemblyOriginatorKeyMode", "File", true, signAssemblyBinding.Location);
+				}
+			};
+			*/
 			if (signAssemblyCheckBox.IsChecked == true) {
 				this.AssemblyOriginatorKeyFile.Value = "File";
 			}
@@ -128,6 +136,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 			}
 		}
 		
+		
 		void KeyFileComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
 		{
 			var cbo = (ComboBox) sender;