diff --git a/apps/opencs/view/widget/coloreditor.cpp b/apps/opencs/view/widget/coloreditor.cpp
index 798502196e..7ef1ec7b17 100644
--- a/apps/opencs/view/widget/coloreditor.cpp
+++ b/apps/opencs/view/widget/coloreditor.cpp
@@ -6,13 +6,15 @@
 #include <QDesktopWidget>
 #include <QPainter>
 #include <QRect>
+#include <QShowEvent>
 
 #include "colorpickerpopup.hpp"
 
-CSVWidget::ColorEditor::ColorEditor(const QColor &color, QWidget *parent)
+CSVWidget::ColorEditor::ColorEditor(const QColor &color, QWidget *parent, bool popupOnStart)
     : QPushButton(parent),
       mColor(color),
-      mColorPicker(new ColorPickerPopup(this))
+      mColorPicker(new ColorPickerPopup(this)),
+      mPopupOnStart(popupOnStart)
 {
     setCheckable(true);
     connect(this, SIGNAL(clicked()), this, SLOT(showPicker()));
@@ -35,6 +37,17 @@ void CSVWidget::ColorEditor::paintEvent(QPaintEvent *event)
     painter.drawRect(coloredRect);
 }
 
+void CSVWidget::ColorEditor::showEvent(QShowEvent *event)
+{
+    QPushButton::showEvent(event);
+    if (isVisible() && mPopupOnStart)
+    {
+        setChecked(true);
+        showPicker();
+        mPopupOnStart = false;
+    }
+}
+
 QColor CSVWidget::ColorEditor::color() const
 {
     return mColor;
diff --git a/apps/opencs/view/widget/coloreditor.hpp b/apps/opencs/view/widget/coloreditor.hpp
index cca26fade1..61232cb13e 100644
--- a/apps/opencs/view/widget/coloreditor.hpp
+++ b/apps/opencs/view/widget/coloreditor.hpp
@@ -17,17 +17,19 @@ namespace CSVWidget
 
             QColor mColor;
             ColorPickerPopup *mColorPicker;
+            bool mPopupOnStart;
 
             QPoint calculatePopupPosition();
 
         public:
-            ColorEditor(const QColor &color, QWidget *parent = 0);
+            ColorEditor(const QColor &color, QWidget *parent = 0, bool popupOnStart = false);
 
             QColor color() const;
             void setColor(const QColor &color);
 
         protected:
-            void paintEvent(QPaintEvent *event);
+            virtual void paintEvent(QPaintEvent *event);
+            virtual void showEvent(QShowEvent *event);
 
         private slots:
             void showPicker();
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index de088bffc9..5974987c0c 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -172,6 +172,12 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
     {
         return QStyledItemDelegate::createEditor(parent, option, index);
     }
+    // For tables the pop-up of the color editor should appear immediately after the editor creation
+    // (the third parameter of ColorEditor's constructor)
+    else if (display == CSMWorld::ColumnBase::Display_Colour)
+    {
+        return new CSVWidget::ColorEditor(index.data().value<QColor>(), parent, true);
+    }
     return createEditor (parent, option, index, display);
 }