diff --git a/app/widget/marker/marker.cpp b/app/widget/marker/marker.cpp
index b6df9e423..7a1713c22 100644
--- a/app/widget/marker/marker.cpp
+++ b/app/widget/marker/marker.cpp
@@ -31,7 +31,7 @@ namespace olive {
 
 Marker::Marker(QWidget *parent) :
 	QWidget(parent),
-    marker_color_(Qt::green)
+    marker_color_(7) //green FIXME: add default color to config
 {
   setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
   setMinimumSize(20, 20);
@@ -62,7 +62,7 @@ void Marker::paintEvent(QPaintEvent *event)
 
   QPainter p(this);
   p.setPen(Qt::black);
-  p.setBrush(marker_color_);
+  p.setBrush(ColorCoding::GetColor(marker_color_).toQColor());
 
   p.setRenderHint(QPainter::Antialiasing);
 
@@ -92,7 +92,7 @@ void Marker::ShowContextMenu() {
 
 void Marker::SetColor(int c)
 {
-  marker_color_ = ColorCoding::GetColor(c).toQColor();
+  marker_color_ = c;
 
   update();
 }
diff --git a/app/widget/marker/marker.h b/app/widget/marker/marker.h
index ed84f8d45..da42d28e0 100644
--- a/app/widget/marker/marker.h
+++ b/app/widget/marker/marker.h
@@ -46,7 +46,7 @@ class Marker : public QWidget {
  private:
   ColorLabelMenu* color_coding_menu_;
 
-  QColor marker_color_;
+  int marker_color_;
 
  private slots:
   void ShowContextMenu();