diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/StyledTableView.qml b/src/framework/uicomponents/qml/Muse/UiComponents/StyledTableView.qml
index 7c3bf0e002f2f..c9c124115447a 100644
--- a/src/framework/uicomponents/qml/Muse/UiComponents/StyledTableView.qml
+++ b/src/framework/uicomponents/qml/Muse/UiComponents/StyledTableView.qml
@@ -36,6 +36,7 @@ Item {
 
     property bool showVerticalHeader: false
     property bool horizontalHeaderNavigationEnabled: true
+    property bool displayTruncatedTextOnHover: false
 
     property var currentEditedCell: null
 
@@ -77,6 +78,7 @@ Item {
     }
 
     signal handleItem(var index, var item)
+    signal horizontalHeaderClicked(int column)
 
     QtObject {
         id: prv
@@ -136,6 +138,10 @@ Item {
             onFormatChangeRequested: function(formatId) {
                 display.currentFormatId = formatId
             }
+
+            onClicked: {
+                root.horizontalHeaderClicked(index)
+            }
         }
     }
 
@@ -237,6 +243,7 @@ Item {
             preferredWidth: hHeaderData.preferredWidth
 
             sourceComponentCallback: root.sourceComponentCallback
+            displayTruncatedTextOnHover: root.displayTruncatedTextOnHover
 
             isSelected: tableView.selectionModel.hasSelection && tableView.selectionModel.isSelected(tableView.model.index(row, column))
             evenMargins: showVerticalHeader
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/abstracttableviewmodel.cpp b/src/framework/uicomponents/qml/Muse/UiComponents/abstracttableviewmodel.cpp
index 61870276cdd3e..188d55e75ae9c 100644
--- a/src/framework/uicomponents/qml/Muse/UiComponents/abstracttableviewmodel.cpp
+++ b/src/framework/uicomponents/qml/Muse/UiComponents/abstracttableviewmodel.cpp
@@ -89,10 +89,6 @@ ItemMultiSelectionModel* AbstractTableViewModel::selectionModel() const
 
 void AbstractTableViewModel::setTable(const QVector<QVector<TableViewCell*> >& table)
 {
-    if (table.isEmpty()) {
-        return;
-    }
-
     for (const auto& row : std::as_const(m_table)) {
         for (TableViewCell* cell : row) {
             if (cell) {
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/internal/StyledTableViewCell.qml b/src/framework/uicomponents/qml/Muse/UiComponents/internal/StyledTableViewCell.qml
index ee7515572d56b..368c335ac77fe 100644
--- a/src/framework/uicomponents/qml/Muse/UiComponents/internal/StyledTableViewCell.qml
+++ b/src/framework/uicomponents/qml/Muse/UiComponents/internal/StyledTableViewCell.qml
@@ -39,6 +39,7 @@ TableViewDelegate {
 
     property bool isSelected: false
     property bool evenMargins: false
+    property bool displayTruncatedTextOnHover: false
 
     property alias navigation: listItem.navigation
 
@@ -517,6 +518,7 @@ TableViewDelegate {
                             text: root.cellType === TableViewCellType.List ? root.itemData.current : val
                             textFormat: Text.PlainText
                             horizontalAlignment: Text.AlignLeft
+                            displayTruncatedTextOnHover: root.displayTruncatedTextOnHover
                         }
                     }
                 }