diff --git a/src/frontends/qt4/QBox.cpp b/src/frontends/qt4/QBox.cpp
index 18653245ab..d58155ecb0 100644
--- a/src/frontends/qt4/QBox.cpp
+++ b/src/frontends/qt4/QBox.cpp
@@ -376,7 +376,10 @@ void QBox::setInnerType(bool frameless, int i)
 		dialog_->innerBoxCO->clear();
 		dialog_->innerBoxCO->addItem(qt_("Parbox"));
 		dialog_->innerBoxCO->addItem(qt_("Minipage"));
-		dialog_->innerBoxCO->setCurrentIndex(i - 1);
+		if (i != 0)
+			dialog_->innerBoxCO->setCurrentIndex(i - 1);
+		else
+			dialog_->innerBoxCO->setCurrentIndex(i);
 	} else {
 		if (dialog_->innerBoxCO->count() == 2)
 			i += 1;
diff --git a/status.15x b/status.15x
index 57ba771220..482aef7e0f 100644
--- a/status.15x
+++ b/status.15x
@@ -159,6 +159,9 @@ What's new
   typing a space after switching between 2 documents with the file->Open
   dialog (bug 4211).
 
+- Fix bug in box dialog where the inner box was empty when switching
+  the box decoration (bug 4233).
+
 
 * DOCUMENTATION