diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 180327c769..fd66d384c1 100644
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -1923,8 +1923,17 @@ void PrefFileformats::on_shortcutED_textEdited(const QString & s)
 void PrefFileformats::on_formatED_editingFinished()
 {
 	string const newname = fromqstr(formatED->displayText());
-	if (newname == currentFormat().name())
+	string const oldname = currentFormat().name();
+	if (newname == oldname)
 		return;
+	if (form_->converters().formatIsUsed(oldname)) {
+		Alert::error(_("Format in use"),
+			     _("You cannot change a format's short name "
+			       "if the format is used by a converter. "
+			       "Please remove the converter first."));
+		updateView();
+		return;
+	}
 
 	currentFormat().setName(newname);
 	changed();