diff --git a/klipper/historymodel.cpp b/klipper/historymodel.cpp
index b873a22db..ecf33507c 100644
--- a/klipper/historymodel.cpp
+++ b/klipper/historymodel.cpp
@@ -70,15 +70,15 @@ QVariant HistoryModel::data(const QModelIndex &index, int role) const
         return item->text();
     case Qt::DecorationRole:
         return item->image();
-    case Qt::UserRole:
+    case HistoryItemConstPtrRole:
         return QVariant::fromValue<HistoryItemConstPtr>(qSharedPointerConstCast<const HistoryItem>(item));
-    case Qt::UserRole + 1:
+    case UuidRole:
         return item->uuid();
-    case Qt::UserRole + 2:
+    case TypeRole:
         return QVariant::fromValue<HistoryItemType>(type);
-    case Qt::UserRole + 3:
+    case Base64UuidRole:
         return item->uuid().toBase64();
-    case Qt::UserRole + 4:
+    case TypeIntRole:
         return int(type);
     }
     return QVariant();
@@ -200,7 +200,7 @@ QHash<int, QByteArray> HistoryModel::roleNames() const
     QHash<int, QByteArray> hash;
     hash.insert(Qt::DisplayRole, QByteArrayLiteral("DisplayRole"));
     hash.insert(Qt::DecorationRole, QByteArrayLiteral("DecorationRole"));
-    hash.insert(Qt::UserRole + 3, QByteArrayLiteral("UuidRole"));
-    hash.insert(Qt::UserRole + 4, QByteArrayLiteral("TypeRole"));
+    hash.insert(Base64UuidRole, QByteArrayLiteral("UuidRole"));
+    hash.insert(TypeIntRole, QByteArrayLiteral("TypeRole"));
     return hash;
 }
diff --git a/klipper/historymodel.h b/klipper/historymodel.h
index ec291be98..2344c9d63 100644
--- a/klipper/historymodel.h
+++ b/klipper/historymodel.h
@@ -20,6 +20,15 @@ class HistoryModel : public QAbstractListModel
 {
     Q_OBJECT
 public:
+    enum RoleType {
+        HistoryItemConstPtrRole = Qt::UserRole,
+        UuidRole,
+        TypeRole,
+        Base64UuidRole,
+        TypeIntRole,
+    };
+    Q_ENUM(RoleType)
+
     explicit HistoryModel(QObject *parent = nullptr);
     ~HistoryModel() override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;