diff --git a/resources.qrc b/resources.qrc
index 9d1da12609314..19994e2962f1f 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -5,7 +5,6 @@
         <file>src/gui/EmojiPicker.qml</file>
         <file>src/gui/UserStatusSelectorButton.qml</file>
         <file>src/gui/PredefinedStatusButton.qml</file>
-        <file>src/gui/BasicComboBox.qml</file>
         <file>src/gui/ErrorBox.qml</file>
         <file>src/gui/filedetails/FileActivityView.qml</file>
         <file>src/gui/filedetails/FileDetailsPage.qml</file>
diff --git a/src/gui/BasicComboBox.qml b/src/gui/BasicComboBox.qml
deleted file mode 100644
index a890adeaf665e..0000000000000
--- a/src/gui/BasicComboBox.qml
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2022 by Claudio Cambra <claudio.cambra@nextcloud.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- */
-
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt5Compat.GraphicalEffects
-
-import Style
-import "./tray"
-
-ComboBox {
-    id: clearComboBox
-
-    topPadding: Style.smallSpacing + topInset
-    leftPadding: Style.smallSpacing + leftInset
-    rightPadding: Style.smallSpacing + rightInset
-    bottomPadding: Style.smallSpacing + bottomInset
-
-    background: Rectangle {
-        radius: Style.slightlyRoundedButtonRadius
-        color: palette.button
-        opacity: clearComboBox.hovered ? Style.hoverOpacity : 1.0
-    }
-
-    contentItem: EnforcedPlainTextLabel {
-        leftPadding: clearComboBox.leftPadding
-        rightPadding: clearComboBox.indicator.width + clearComboBox.spacing
-
-        text: clearComboBox.displayText
-        verticalAlignment: Text.AlignVCenter
-        elide: Text.ElideRight
-    }
-
-    indicator: ColorOverlay {
-        anchors.right: clearComboBox.right
-        anchors.rightMargin: clearComboBox.rightPadding
-        anchors.verticalCenter: clearComboBox.verticalCenter
-
-        cached: true
-        width: source.width
-        height: source.height
-
-        source: Image {
-            horizontalAlignment: Qt.AlignRight
-            verticalAlignment: Qt.AlignVCenter
-            source: "image://svgimage-custom-color/caret-down.svg/" + palette.windowText
-            sourceSize.width: Style.accountDropDownCaretSize
-            sourceSize.height: Style.accountDropDownCaretSize
-            Accessible.role: Accessible.PopupMenu
-            Accessible.name: qsTr("Clear status message menu")
-        }
-    }
-
-    popup: Popup {
-        y: clearComboBox.height - Style.normalBorderWidth
-        width: clearComboBox.width
-        implicitHeight: contentItem.implicitHeight
-        padding: Style.normalBorderWidth
-
-        contentItem: ListView {
-            clip: true
-            implicitHeight: contentHeight
-            model: clearComboBox.popup.visible ? clearComboBox.delegateModel : null
-            currentIndex: clearComboBox.highlightedIndex
-
-            ScrollIndicator.vertical: ScrollIndicator { }
-        }
-
-        background: Rectangle {
-            color: palette.toolTipBase
-            border.color: palette.dark
-            radius: Style.slightlyRoundedButtonRadius
-        }
-    }
-
-
-    delegate: ItemDelegate {
-        id: clearStatusDelegate
-        width: clearComboBox.width
-        contentItem: EnforcedPlainTextLabel {
-            text: modelData.display
-            elide: Text.ElideRight
-            verticalAlignment: Text.AlignVCenter
-        }
-        highlighted: clearComboBox.highlightedIndex === index
-    }
-}
diff --git a/src/gui/UserStatusSelector.qml b/src/gui/UserStatusSelector.qml
index 3e303b469bee6..9ce7043d0cea6 100644
--- a/src/gui/UserStatusSelector.qml
+++ b/src/gui/UserStatusSelector.qml
@@ -293,7 +293,7 @@ ColumnLayout {
                 wrapMode: Text.Wrap
             }
 
-            BasicComboBox {
+            ComboBox {
                 id: clearComboBox
 
                 Layout.fillWidth: true