diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionQModel.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionQModel.cpp
index c113024834..b05bdee04e 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionQModel.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionQModel.cpp
@@ -225,12 +225,13 @@ Qt::ItemFlags caf::PdmUiTreeSelectionQModel::flags(const QModelIndex &index) con
     {
         const caf::PdmOptionItemInfo* optionItemInfo = optionItem(index);
 
-        if (optionItemInfo->isReadOnly())
-        {
-            return QAbstractItemModel::flags(index)^Qt::ItemIsEnabled;
-        }
-        else if (!optionItemInfo->isHeading())
+        if (!optionItemInfo->isHeading())
         {
+            if (optionItemInfo->isReadOnly())
+            {
+                return QAbstractItemModel::flags(index)^Qt::ItemIsEnabled;
+            }
+
             return QAbstractItemModel::flags(index) | Qt::ItemIsUserCheckable;
         }
     }