diff --git a/Source/UnSwDialog.dfm b/Source/UnSwDialog.dfm
index 455b522..07e4fff 100644
--- a/Source/UnSwDialog.dfm
+++ b/Source/UnSwDialog.dfm
@@ -1,10 +1,10 @@
 object frmUnSwDialog: TfrmUnSwDialog
   Left = 187
   Top = 83
+  Width = 320
+  Height = 425
   BorderIcons = [biSystemMenu]
   Caption = 'UnitSwitcher'
-  ClientHeight = 398
-  ClientWidth = 312
   Color = clBtnFace
   Constraints.MinHeight = 240
   Constraints.MinWidth = 290
diff --git a/Source/UnSwDialog.pas b/Source/UnSwDialog.pas
index 5309242..78e69b5 100644
--- a/Source/UnSwDialog.pas
+++ b/Source/UnSwDialog.pas
@@ -595,8 +595,8 @@ begin
   else
     dialogSettings  := Settings.UnitsDialog;
 
-  dialogSettings.IncludeDataModules   := chkForms.Checked;
-  dialogSettings.IncludeForms         := chkDataModules.Checked;
+  dialogSettings.IncludeDataModules   := chkDataModules.Checked;
+  dialogSettings.IncludeForms         := chkForms.Checked;
   dialogSettings.IncludeUnits         := chkUnits.Checked;
   dialogSettings.IncludeProjectSource := chkProjectSource.Checked;