diff --git a/qt/OpenRGBDialog/OpenRGBDialog.cpp b/qt/OpenRGBDialog/OpenRGBDialog.cpp
index 01d77c65c..9405fa1dd 100644
--- a/qt/OpenRGBDialog/OpenRGBDialog.cpp
+++ b/qt/OpenRGBDialog/OpenRGBDialog.cpp
@@ -1021,7 +1021,6 @@ void OpenRGBDialog::UpdateDevicesList()
                         TabLabel* NewTabLabel = new TabLabel(OpenRGBFont::GetIconIDFromDeviceType(controllers[controller_idx]->GetDeviceType()), QString::fromStdString(controllers[controller_idx]->GetName()), (char *)controllers[controller_idx]->GetName().c_str(), (char *)context);
 
                         ui->DevicesTabBar->tabBar()->setTabButton(ui->DevicesTabBar->count() - 1, QTabBar::LeftSide, NewTabLabel);
-                        ui->DevicesTabBar->tabBar()->setTabToolTip(ui->DevicesTabBar->count() - 1, QString::fromStdString(controllers[controller_idx]->GetName()));
 
                         /*---------------------------------*\
                         | Now move the new tab to the       |
@@ -1089,7 +1088,6 @@ void OpenRGBDialog::UpdateDevicesList()
                 TabLabel* NewTabLabel = new TabLabel(OpenRGBFont::GetIconIDFromDeviceType(controllers[controller_idx]->GetDeviceType()), QString::fromStdString(controllers[controller_idx]->GetName()), (char *)controllers[controller_idx]->GetName().c_str(), (char *)context);
 
                 ui->DevicesTabBar->tabBar()->setTabButton(ui->DevicesTabBar->count() - 1, QTabBar::LeftSide, NewTabLabel);
-                ui->DevicesTabBar->tabBar()->setTabToolTip(ui->DevicesTabBar->count() - 1, QString::fromStdString(controllers[controller_idx]->GetName()));
 
                 /*-----------------------------------------*\
                 | Now move the new tab to the correct       |
diff --git a/qt/TabLabel.cpp b/qt/TabLabel.cpp
index 261fadf0e..ba60a4a58 100644
--- a/qt/TabLabel.cpp
+++ b/qt/TabLabel.cpp
@@ -41,6 +41,11 @@ TabLabel::TabLabel(int icon, QString name, char* original, char* context) :
     \*-----------------------------------------------------*/
     ui->name->setText(name);
 
+    /*-----------------------------------------------------*\
+    | Set tooltip                                           |
+    \*-----------------------------------------------------*/
+    setToolTip(name);
+
     SetTextHidden(false);
 
     label   = original;