diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
index 04540f891a..ca0ec2faff 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
@@ -77,14 +77,14 @@ namespace O3DE::ProjectManager
         QString gemName = GemModel::GetName(modelIndex);
         QFont gemNameFont(options.font);
         const int firstColumnMaxTextWidth = s_summaryStartX - 30;
-        gemName = QFontMetrics(gemNameFont).elidedText(gemName, Qt::TextElideMode::ElideRight, firstColumnMaxTextWidth);
         gemNameFont.setPixelSize(s_gemNameFontSize);
         gemNameFont.setBold(true);
+        gemName = QFontMetrics(gemNameFont).elidedText(gemName, Qt::TextElideMode::ElideRight, firstColumnMaxTextWidth);
         QRect gemNameRect = GetTextRect(gemNameFont, gemName, s_gemNameFontSize);
         gemNameRect.moveTo(contentRect.left(), contentRect.top());
-
         painter->setFont(gemNameFont);
         painter->setPen(m_textColor);
+        gemNameRect = painter->boundingRect(gemNameRect, Qt::TextSingleLine, gemName);
         painter->drawText(gemNameRect, Qt::TextSingleLine, gemName);
 
         // Gem creator
@@ -95,6 +95,7 @@ namespace O3DE::ProjectManager
 
         painter->setFont(standardFont);
         painter->setPen(m_linkColor);
+        gemCreatorRect = painter->boundingRect(gemCreatorRect, Qt::TextSingleLine, gemCreator);
         painter->drawText(gemCreatorRect, Qt::TextSingleLine, gemCreator);
 
         // Gem summary
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp
index d2586bb62b..cabcc34aaa 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp
@@ -31,7 +31,7 @@ namespace O3DE::ProjectManager
         topLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding));
 
         QLabel* showCountLabel = new QLabel();
-        showCountLabel->setStyleSheet("font-size: 12px; font: italic;");
+        showCountLabel->setStyleSheet("font-size: 12px; font: italic; color: #FFFFFF;");
         topLayout->addWidget(showCountLabel);
         connect(proxyModel, &GemSortFilterProxyModel::OnInvalidated, this, [=]
             {
@@ -61,20 +61,20 @@ namespace O3DE::ProjectManager
         columnHeaderLayout->addSpacing(gemNameStartX);
 
         QLabel* gemNameLabel = new QLabel(tr("Gem Name"));
-        gemNameLabel->setStyleSheet("font-size: 12px;");
+        gemNameLabel->setStyleSheet("font-size: 12px; color: #FFFFFF;");
         columnHeaderLayout->addWidget(gemNameLabel);
 
         columnHeaderLayout->addSpacing(77);
 
         QLabel* gemSummaryLabel = new QLabel(tr("Gem Summary"));
-        gemSummaryLabel->setStyleSheet("font-size: 12px;");
+        gemSummaryLabel->setStyleSheet("font-size: 12px; color: #FFFFFF;");
         columnHeaderLayout->addWidget(gemSummaryLabel);
 
         QSpacerItem* horizontalSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
         columnHeaderLayout->addSpacerItem(horizontalSpacer);
 
         QLabel* gemSelectedLabel = new QLabel(tr("Selected"));
-        gemSelectedLabel->setStyleSheet("font-size: 12px;");
+        gemSelectedLabel->setStyleSheet("font-size: 12px; color: #FFFFFF;");
         columnHeaderLayout->addWidget(gemSelectedLabel);
 
         columnHeaderLayout->addSpacing(60);