diff --git a/containments/desktop/package/contents/ui/FolderItemDelegate.qml b/containments/desktop/package/contents/ui/FolderItemDelegate.qml
--- a/containments/desktop/package/contents/ui/FolderItemDelegate.qml
+++ b/containments/desktop/package/contents/ui/FolderItemDelegate.qml
@@ -295,8 +295,6 @@
                     text: model.blank ? "" : model.display
 
                     font.italic: model.isLink
-
-                    Component.onCompleted: textFix.disableMouseHandling(label) // FIXME TODO: See https://codereview.qt-project.org/#/c/113758/
                 }
 
                 Column {
diff --git a/containments/desktop/package/contents/ui/FolderViewLayer.qml b/containments/desktop/package/contents/ui/FolderViewLayer.qml
--- a/containments/desktop/package/contents/ui/FolderViewLayer.qml
+++ b/containments/desktop/package/contents/ui/FolderViewLayer.qml
@@ -65,11 +65,6 @@
         size: "16x16"
     }
 
-    // FIXME TODO: See https://codereview.qt-project.org/#/c/113758/
-    Folder.TextFix {
-        id: textFix
-    }
-
     Folder.MenuHelper {
         id: menuHelper
     }
diff --git a/containments/desktop/plugins/folder/CMakeLists.txt b/containments/desktop/plugins/folder/CMakeLists.txt
--- a/containments/desktop/plugins/folder/CMakeLists.txt
+++ b/containments/desktop/plugins/folder/CMakeLists.txt
@@ -13,7 +13,6 @@
     previewpluginsmodel.cpp
     rubberband.cpp
     subdialog.cpp
-    textfix.cpp
     viewpropertiesmenu.cpp
     wheelinterceptor.cpp
     shortcut.cpp
diff --git a/containments/desktop/plugins/folder/folderplugin.cpp b/containments/desktop/plugins/folder/folderplugin.cpp
--- a/containments/desktop/plugins/folder/folderplugin.cpp
+++ b/containments/desktop/plugins/folder/folderplugin.cpp
@@ -29,7 +29,6 @@
 #include "previewpluginsmodel.h"
 #include "rubberband.h"
 #include "subdialog.h"
-#include "textfix.h"
 #include "viewpropertiesmenu.h"
 #include "wheelinterceptor.h"
 #include "shortcut.h"
@@ -50,7 +49,6 @@
     qmlRegisterType<PreviewPluginsModel>(uri, 0, 1, "PreviewPluginsModel");
     qmlRegisterType<RubberBand>(uri, 0, 1, "RubberBand");
     qmlRegisterType<SubDialog>(uri, 0, 1, "SubDialog");
-    qmlRegisterType<TextFix>(uri, 0, 1, "TextFix");
     qmlRegisterType<ViewPropertiesMenu>(uri, 0, 1, "ViewPropertiesMenu");
     qmlRegisterType<WheelInterceptor>(uri, 0, 1, "WheelInterceptor");
     qmlRegisterType<ShortCut>(uri, 0, 1, "ShortCut");
diff --git a/containments/desktop/plugins/folder/textfix.h b/containments/desktop/plugins/folder/textfix.h
deleted file mode 100644
--- a/containments/desktop/plugins/folder/textfix.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**************************************************************************
- *   Copyright (C) 2015 by Eike Hein <hein@kde.org>                   *
- *                                                                         *
- *   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.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
- ***************************************************************************/
-
-// FIXME TODO: See https://codereview.qt-project.org/#/c/113758/
-
-#ifndef TEXTFIX_H
-#define TEXTFIX_H
-
-#include <QObject>
-
-class QQuickItem;
-
-class TextFix : public QObject
-{
-    Q_OBJECT
-
-    public:
-        TextFix(QObject *parent = 0);
-        ~TextFix();
-
-        Q_INVOKABLE void disableMouseHandling(QQuickItem *textItem);
-};
-
-#endif
diff --git a/containments/desktop/plugins/folder/textfix.cpp b/containments/desktop/plugins/folder/textfix.cpp
deleted file mode 100644
--- a/containments/desktop/plugins/folder/textfix.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2015 by Eike Hein <hein@kde.org>                   *
- *                                                                         *
- *   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.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
- ***************************************************************************/
-
-#include "textfix.h"
-
-#include <QQuickItem>
-
-TextFix::TextFix(QObject *parent) : QObject(parent)
-{
-}
-
-TextFix::~TextFix()
-{
-}
-
-void TextFix::disableMouseHandling(QQuickItem *textItem)
-{
-    if (!textItem) {
-        return;
-    }
-
-    textItem->setAcceptedMouseButtons(Qt::NoButton);
-}