diff --git a/src/widgets/filterwidget.ui b/src/widgets/filterwidget.ui
--- a/src/widgets/filterwidget.ui
+++ b/src/widgets/filterwidget.ui
@@ -46,6 +46,9 @@
        <property name="checkable">
         <bool>true</bool>
        </property>
+       <property name="autoRaise">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>
@@ -70,6 +73,9 @@
       </item>
       <item>
        <widget class="QToolButton" name="ascendingButton">
+        <property name="toolTip">
+         <string>Sort in ascending order</string>
+        </property>
         <property name="text">
          <string/>
         </property>
@@ -82,13 +88,19 @@
         <property name="checked">
          <bool>true</bool>
         </property>
+        <property name="autoRaise">
+         <bool>true</bool>
+        </property>
         <attribute name="buttonGroup">
          <string notr="true">sortOrderGroup</string>
         </attribute>
        </widget>
       </item>
       <item>
        <widget class="QToolButton" name="descendingButton">
+        <property name="toolTip">
+         <string>Sort in descending order</string>
+        </property>
         <property name="text">
          <string/>
         </property>
@@ -98,6 +110,9 @@
         <property name="checkable">
          <bool>true</bool>
         </property>
+        <property name="autoRaise">
+         <bool>true</bool>
+        </property>
         <attribute name="buttonGroup">
          <string notr="true">sortOrderGroup</string>
         </attribute>
diff --git a/tests/units/widgets/filterwidgettest.cpp b/tests/units/widgets/filterwidgettest.cpp
--- a/tests/units/widgets/filterwidgettest.cpp
+++ b/tests/units/widgets/filterwidgettest.cpp
@@ -23,9 +23,9 @@
 
 #include <testlib/qtest_gui_zanshin.h>
 
-#include <QAbstractButton>
 #include <QComboBox>
 #include <QLineEdit>
+#include <QToolButton>
 
 #include "widgets/filterwidget.h"
 
@@ -51,28 +51,31 @@
         QVERIFY(filterEdit->text().isEmpty());
         QCOMPARE(filterEdit->placeholderText(), tr("Filter..."));
 
-        QAbstractButton *extensionButton = filter.findChild<QAbstractButton*>(QStringLiteral("extensionButton"));
+        auto extensionButton = filter.findChild<QToolButton*>(QStringLiteral("extensionButton"));
         QVERIFY(extensionButton);
         QVERIFY(extensionButton->isVisibleTo(&filter));
         QVERIFY(!extensionButton->isChecked());
         QCOMPARE(extensionButton->icon(), QIcon::fromTheme(QStringLiteral("arrow-down-double")));
+        QVERIFY(extensionButton->autoRaise());
 
         QComboBox *sortTypeCombo = filter.findChild<QComboBox*>(QStringLiteral("sortTypeCombo"));
         QVERIFY(sortTypeCombo);
         QVERIFY(!sortTypeCombo->isVisibleTo(&filter));
         QCOMPARE(sortTypeCombo->currentIndex(), 0);
 
-        QAbstractButton *ascendingButton = filter.findChild<QAbstractButton*>(QStringLiteral("ascendingButton"));
+        auto ascendingButton = filter.findChild<QToolButton*>(QStringLiteral("ascendingButton"));
         QVERIFY(ascendingButton);
         QVERIFY(!ascendingButton->isVisibleTo(&filter));
         QVERIFY(ascendingButton->isChecked());
         QCOMPARE(ascendingButton->icon(), QIcon::fromTheme(QStringLiteral("arrow-up")));
+        QVERIFY(ascendingButton->autoRaise());
 
-        QAbstractButton *descendingButton = filter.findChild<QAbstractButton*>(QStringLiteral("descendingButton"));
+        auto descendingButton = filter.findChild<QToolButton*>(QStringLiteral("descendingButton"));
         QVERIFY(descendingButton);
         QVERIFY(!descendingButton->isVisibleTo(&filter));
         QVERIFY(!descendingButton->isChecked());
         QCOMPARE(descendingButton->icon(), QIcon::fromTheme(QStringLiteral("arrow-down")));
+        QVERIFY(descendingButton->autoRaise());
     }
 
     void shouldChangeAppliedFilter()