diff --git a/Greenshot/releases/additional_files/readme.txt b/Greenshot/releases/additional_files/readme.txt
index 23c9d6ccc..918f76737 100644
--- a/Greenshot/releases/additional_files/readme.txt
+++ b/Greenshot/releases/additional_files/readme.txt
@@ -12,6 +12,8 @@ Bugs resolved:
 * Bug #3582282: Exporting captures to Microsoft Office applications give problems when the Office application shows a dialog, this is fixed by displaying a retry dialog with info.
 * Bug #3582282: Exported captures to Powerpoint were displayed cropped, which needed extra actions to correct.
 * Bug #3572995: On Windows XP Firefox captures are mainly black, this fix does not only work for Firefox.
+* Bug #3585393: resize issues with some the plugin configuration dialogs.
+* Not reported: Flickr configuration for the Family, Friend & Public wasn't stored.
 * Removed unneeded code from the Confluence Plug-in, this makes the Greenshot installer / .zip a bit smaller.
 
 Features:
diff --git a/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml b/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml
index 1a41a7c7c..b22e55d9b 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml
+++ b/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml
@@ -4,7 +4,7 @@
     xmlns:gscp="clr-namespace:GreenshotConfluencePlugin"
     xmlns:l="clr-namespace:TranslationByMarkupExtension"
     xmlns:gsc="clr-namespace:GreenshotPlugin.Core;assembly=GreenshotPlugin"
-	Title="{l:Translate plugin_settings}" SizeToContent="WidthAndHeight" Icon="/GreenshotConfluencePlugin;component/Images/Confluence.ico">
+	Title="{l:Translate plugin_settings}" SizeToContent="WidthAndHeight" ResizeMode="NoResize" Icon="/GreenshotConfluencePlugin;component/Images/Confluence.ico">
 	<Window.Resources>
         <gscp:EnumDisplayer Type="{x:Type gsc:OutputFormat}" x:Key="outputFormats"/>
 	</Window.Resources>
diff --git a/GreenshotExternalCommandPlugin/SettingsForm.Designer.cs b/GreenshotExternalCommandPlugin/SettingsForm.Designer.cs
index c7b5da114..91d640d7e 100644
--- a/GreenshotExternalCommandPlugin/SettingsForm.Designer.cs
+++ b/GreenshotExternalCommandPlugin/SettingsForm.Designer.cs
@@ -141,6 +141,7 @@ namespace ExternalCommand {
 			this.Controls.Add(this.listView1);
 			this.Controls.Add(this.buttonOk);
 			this.Controls.Add(this.buttonCancel);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
 			this.LanguageKey = "externalcommand.settings_title";
 			this.Name = "SettingsForm";
 			this.ResumeLayout(false);
diff --git a/GreenshotFlickrPlugin/Forms/SettingsForm.Designer.cs b/GreenshotFlickrPlugin/Forms/SettingsForm.Designer.cs
index b5f8d1b2b..198af5741 100644
--- a/GreenshotFlickrPlugin/Forms/SettingsForm.Designer.cs
+++ b/GreenshotFlickrPlugin/Forms/SettingsForm.Designer.cs
@@ -112,7 +112,7 @@ namespace GreenshotFlickrPlugin {
 			this.checkBoxPublic.LanguageKey = "flickr.public";
 			this.checkBoxPublic.Location = new System.Drawing.Point(174, 88);
 			this.checkBoxPublic.Name = "checkBoxPublic";
-			this.checkBoxPublic.PropertyName = "IsPublic";
+			this.checkBoxPublic.PropertyName = "flickrIsPublic";
 			this.checkBoxPublic.SectionName = "Flickr";
 			this.checkBoxPublic.Size = new System.Drawing.Size(55, 17);
 			this.checkBoxPublic.TabIndex = 11;
@@ -125,7 +125,7 @@ namespace GreenshotFlickrPlugin {
 			this.checkBoxFamily.LanguageKey = "flickr.family";
 			this.checkBoxFamily.Location = new System.Drawing.Point(265, 88);
 			this.checkBoxFamily.Name = "checkBoxFamily";
-			this.checkBoxFamily.PropertyName = "IsFamily";
+			this.checkBoxFamily.PropertyName = "flickrIsFamily";
 			this.checkBoxFamily.SectionName = "Flickr";
 			this.checkBoxFamily.Size = new System.Drawing.Size(55, 17);
 			this.checkBoxFamily.TabIndex = 12;
@@ -138,7 +138,7 @@ namespace GreenshotFlickrPlugin {
 			this.checkBoxFriend.LanguageKey = "flickr.friend";
 			this.checkBoxFriend.Location = new System.Drawing.Point(350, 88);
 			this.checkBoxFriend.Name = "checkBoxFriend";
-			this.checkBoxFriend.PropertyName = "IsFriend";
+			this.checkBoxFriend.PropertyName = "flickrIsFriend";
 			this.checkBoxFriend.SectionName = "Flickr";
 			this.checkBoxFriend.Size = new System.Drawing.Size(52, 17);
 			this.checkBoxFriend.TabIndex = 13;
diff --git a/GreenshotJiraPlugin/Forms/SettingsForm.Designer.cs b/GreenshotJiraPlugin/Forms/SettingsForm.Designer.cs
index 0cf415d15..560c02521 100644
--- a/GreenshotJiraPlugin/Forms/SettingsForm.Designer.cs
+++ b/GreenshotJiraPlugin/Forms/SettingsForm.Designer.cs
@@ -128,6 +128,7 @@ namespace GreenshotJiraPlugin {
 			this.Controls.Add(this.textBoxUrl);
 			this.Controls.Add(this.buttonCancel);
 			this.Controls.Add(this.buttonOK);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
 			this.LanguageKey = "settings_title";
 			this.MaximizeBox = false;
 			this.MinimizeBox = false;
diff --git a/PluginExample/SettingsForm.Designer.cs b/PluginExample/SettingsForm.Designer.cs
index 2702f9c73..a3b304428 100644
--- a/PluginExample/SettingsForm.Designer.cs
+++ b/PluginExample/SettingsForm.Designer.cs
@@ -100,11 +100,12 @@ namespace PluginExample
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(187, 106);
+			this.ClientSize = new System.Drawing.Size(200, 106);
 			this.Controls.Add(this.checkBox2);
 			this.Controls.Add(this.button2);
 			this.Controls.Add(this.button1);
 			this.Controls.Add(this.checkBox1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
 			this.Name = "SettingsForm";
 			this.Text = "Plugin example settings";
 			this.ResumeLayout(false);