diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 8187ce074..81d7f8fb5 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -1640,6 +1640,10 @@ void MainWindow::browseTableHeaderClicked(int logicalindex)
     ui->dataTable->setCurrentIndex(ui->dataTable->currentIndex().sibling(0, logicalindex));
 
     attachPlot(ui->dataTable, m_browseTableModel, &browseTableSettings[currentlyBrowsedTableName()]);
+
+    // This seems to be necessary as a workaround for newer Qt versions. Otherwise the rowid column is always shown after changing the filters.
+    bool showRowid = browseTableSettings[currentlyBrowsedTableName()].showRowid;
+    ui->dataTable->setColumnHidden(0, !showRowid);
 }
 
 void MainWindow::resizeEvent(QResizeEvent*)