diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -921,7 +921,7 @@
 }
 
 void BitcoinGUI::showDebugWindowActivateConsole() {
-    rpcConsole->setTabFocus(RPCConsole::TAB_CONSOLE);
+    rpcConsole->setTabFocus(RPCConsole::TabTypes::CONSOLE);
     showDebugWindow();
 }
 
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -61,15 +61,11 @@
 
     enum MessageClass { MC_ERROR, MC_DEBUG, CMD_REQUEST, CMD_REPLY, CMD_ERROR };
 
-    enum TabTypes {
-        TAB_INFO = 0,
-        TAB_CONSOLE = 1,
-        TAB_GRAPH = 2,
-        TAB_PEERS = 3
-    };
+    enum class TabTypes { INFO, CONSOLE, GRAPH, PEERS };
 
     std::vector<TabTypes> tabs() const {
-        return {TAB_INFO, TAB_CONSOLE, TAB_GRAPH, TAB_PEERS};
+        return {TabTypes::INFO, TabTypes::CONSOLE, TabTypes::GRAPH,
+                TabTypes::PEERS};
     }
 
     QString tabTitle(TabTypes tab_type) const;
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -1459,26 +1459,26 @@
 }
 
 void RPCConsole::setTabFocus(enum TabTypes tabType) {
-    ui->tabWidget->setCurrentIndex(tabType);
+    ui->tabWidget->setCurrentIndex(int(tabType));
 }
 
 QString RPCConsole::tabTitle(TabTypes tab_type) const {
-    return ui->tabWidget->tabText(tab_type);
+    return ui->tabWidget->tabText(int(tab_type));
 }
 
 QKeySequence RPCConsole::tabShortcut(TabTypes tab_type) const {
     switch (tab_type) {
-        case TAB_INFO:
+        case TabTypes::INFO:
             return QKeySequence(Qt::CTRL + Qt::Key_I);
-        case TAB_CONSOLE:
+        case TabTypes::CONSOLE:
             return QKeySequence(Qt::CTRL + Qt::Key_T);
-        case TAB_GRAPH:
+        case TabTypes::GRAPH:
             return QKeySequence(Qt::CTRL + Qt::Key_N);
-        case TAB_PEERS:
+        case TabTypes::PEERS:
             return QKeySequence(Qt::CTRL + Qt::Key_P);
-        default:
-            return QKeySequence();
-    }
+    } // no default case, so the compiler can warn about missing cases
+
+    assert(false);
 }
 
 void RPCConsole::updateAlerts(const QString &warnings) {