diff --git a/quickevent/app/quickevent/plugins/Classes/src/classeswidget.cpp b/quickevent/app/quickevent/plugins/Classes/src/classeswidget.cpp
index 904d2dfa3..eb93ffa43 100644
--- a/quickevent/app/quickevent/plugins/Classes/src/classeswidget.cpp
+++ b/quickevent/app/quickevent/plugins/Classes/src/classeswidget.cpp
@@ -297,7 +297,8 @@ void ClassesWidget::settleDownInPartWidget(::PartWidget *part_widget)
 void ClassesWidget::edit_courses()
 {
 	qf::gui::dialogs::Dialog dlg(QDialogButtonBox::Close, this);
-	auto *w = new EditCoursesWidget();
+	int stage_id = selectedStageId();
+	auto *w = new EditCoursesWidget(stage_id);
 	dlg.setCentralWidget(w);
 	dlg.exec();
 	reload();
diff --git a/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.cpp b/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.cpp
index b2b5d069a..6f25fc193 100644
--- a/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.cpp
+++ b/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.cpp
@@ -62,7 +62,7 @@ class CoursesTableModel : public qfm::SqlTableModel
 	}
 };
 
-EditCoursesWidget::EditCoursesWidget(QWidget *parent)
+EditCoursesWidget::EditCoursesWidget(int stage_id, QWidget *parent)
 	: Super(parent)
 	, ui(new Ui::EditCoursesWidget)
 {
@@ -122,7 +122,7 @@ EditCoursesWidget::EditCoursesWidget(QWidget *parent)
 				.join("classdefs.classId", "classes.id")
 				.join("classes.id", "competitors.classId")
 				.joinRestricted("competitors.id", "runs.competitorId", "runs.isRunning")
-				.where("classdefs.stageId=runs.stageId")
+				.where("classdefs.stageId=" QF_IARG(stage_id))
 				.groupBy("courses.id")
 				.orderBy("courses.name");
 
diff --git a/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.h b/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.h
index d2bcdeb3a..231db2f07 100644
--- a/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.h
+++ b/quickevent/app/quickevent/plugins/Classes/src/editcourseswidget.h
@@ -15,7 +15,7 @@ class EditCoursesWidget : public qf::gui::framework::DialogWidget
 private:
 	typedef qf::gui::framework::DialogWidget Super;
 public:
-	explicit EditCoursesWidget(QWidget *parent = 0);
+	explicit EditCoursesWidget(int stage_id, QWidget *parent = 0);
 	~EditCoursesWidget() Q_DECL_OVERRIDE;
 
 	void editCourseCodes(const QModelIndex &ix);
diff --git a/quickevent/app/quickevent/src/appversion.h b/quickevent/app/quickevent/src/appversion.h
index 741a90929..f7895f23c 100644
--- a/quickevent/app/quickevent/src/appversion.h
+++ b/quickevent/app/quickevent/src/appversion.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#define APP_VERSION "3.4.6"
+#define APP_VERSION "3.4.7"