diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 7896c4102a..45450ddf03 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1367,7 +1367,7 @@ static FileName selectTemplateFile()
 {
 	FileDialog dlg(qt_("Select template file"));
 	dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
-	dlg.setButton1(qt_("Templates|#T#t"), toqstr(lyxrc.template_path));
+	dlg.setButton2(qt_("Templates|#T#t"), toqstr(lyxrc.template_path));
 
 	FileDialog::Result result = dlg.open(toqstr(lyxrc.template_path),
 			     QStringList(qt_("LyX Documents (*.lyx)")));
diff --git a/status.16x b/status.16x
index 0c489c3211..d427ddf050 100644
--- a/status.16x
+++ b/status.16x
@@ -142,6 +142,8 @@ What's new
 - Don't try to blindly execute the latex command if no latex binary is
   available (bug 6873).
 
+- Fix button link assignment in select from template dialogue.
+
 
 * DOCUMENTATION AND LOCALIZATION