diff --git a/TODO b/TODO
index 283a5a8..ca8fd1e 100644
--- a/TODO
+++ b/TODO
@@ -17,6 +17,10 @@ Bugs to fix for 1.1:
 
 * make sure the default file system can indeed be created
 
+* fs limits in sizedialog: create ext with >4GiB, set fs to fat16 --> it's 
+  correctly resized to 4096MiB. but if align is on, the right handle can
+  still be moved to the next aligned sector
+
 ===============================================================================
 
 For releases after 1.1:
diff --git a/src/gui/insertdialog.cpp b/src/gui/insertdialog.cpp
index c1c81d7..b212dc4 100644
--- a/src/gui/insertdialog.cpp
+++ b/src/gui/insertdialog.cpp
@@ -50,8 +50,8 @@ InsertDialog::InsertDialog(QWidget* parent, Device& device, Partition& insertedP
 	dialogWidget().hideFileSystem();
 	dialogWidget().hideLabel();
 
-	setupConstraints();
 	setupDialog();
+	setupConstraints();
 	setupConnections();
 
 	restoreDialogSize(KConfigGroup(KGlobal::config(), "insertDialog"));
diff --git a/src/gui/newdialog.cpp b/src/gui/newdialog.cpp
index 06acd81..ddafa8a 100644
--- a/src/gui/newdialog.cpp
+++ b/src/gui/newdialog.cpp
@@ -47,8 +47,8 @@ NewDialog::NewDialog(QWidget* parent, Device& device, Partition& unallocatedPart
 {
 	setCaption(i18nc("@title:window", "Create a new partition"));
 
-	setupConstraints();
 	setupDialog();
+	setupConstraints();
 	setupConnections();
 
 	restoreDialogSize(KConfigGroup(KGlobal::config(), "newDialog"));
diff --git a/src/gui/resizedialog.cpp b/src/gui/resizedialog.cpp
index 06c50ea..ea1e54e 100644
--- a/src/gui/resizedialog.cpp
+++ b/src/gui/resizedialog.cpp
@@ -51,8 +51,8 @@ ResizeDialog::ResizeDialog(QWidget* parent, Device& d, Partition& p, qint64 minF
 	dialogWidget().hideFileSystem();
 	dialogWidget().hideLabel();
 
-	setupConstraints();
 	setupDialog();
+	setupConstraints();
 	setupConnections();
 
 	restoreDialogSize(KConfigGroup(KGlobal::config(), "resizeDialog"));
diff --git a/src/gui/sizedialogbase.cpp b/src/gui/sizedialogbase.cpp
index 7c00a28..81b6e7c 100644
--- a/src/gui/sizedialogbase.cpp
+++ b/src/gui/sizedialogbase.cpp
@@ -82,16 +82,6 @@ static qint64 dialogUnitToSectors(const Partition& p, int v)
 
 void SizeDialogBase::setupDialog()
 {
-	// TODO: these don't belong here; the distinction between setupDialog and setupConstraints
-	// doesn't work that well, there's too much interdependency.
-	if (!canShrink())
-		dialogWidget().partResizerWidget().setMinimumLength(partition().length());
-
-	if (!canGrow())
-		dialogWidget().partResizerWidget().setMaximumLength(partition().length());
-
-	dialogWidget().partResizerWidget().init(device(), partition(), minimumFirstSector(), maximumLastSector(), false, canMove());
-
 	dialogWidget().spinFreeBefore().setValue(sectorsToDialogUnit(partition(), partition().firstSector() - minimumFirstSector()));
 	dialogWidget().spinFreeAfter().setValue(sectorsToDialogUnit(partition(), maximumLastSector() - partition().lastSector()));
 
@@ -105,6 +95,8 @@ void SizeDialogBase::setupDialog()
 	detailsWidget().spinLastSector().setValue(partition().lastSector());
 
 	detailsWidget().checkAlign().setChecked(Config::alignDefault());
+
+	dialogWidget().partResizerWidget().init(device(), partition(), minimumFirstSector(), maximumLastSector(), false, canMove());
 	dialogWidget().partResizerWidget().setAlign(Config::alignDefault());
 }