diff --git a/include/widgets/danchors.h b/include/widgets/danchors.h
index caa275f1c..9d1bdb1fd 100644
--- a/include/widgets/danchors.h
+++ b/include/widgets/danchors.h
@@ -11,7 +11,6 @@
 #include <QResizeEvent>
 #include <QMoveEvent>
 #include <QWidget>
-#include <QDebug>
 
 #include <dtkwidget_global.h>
 
diff --git a/include/widgets/darrowbutton.h b/include/widgets/darrowbutton.h
index f86cd0ea5..94334943d 100644
--- a/include/widgets/darrowbutton.h
+++ b/include/widgets/darrowbutton.h
@@ -8,7 +8,6 @@
 #include <QWidget>
 #include <QLabel>
 #include <QStyle>
-#include <QDebug>
 
 #include <dtkwidget_global.h>
 #include <dconstants.h>
diff --git a/include/widgets/darrowrectangle.h b/include/widgets/darrowrectangle.h
index a0050eff2..cf9ca6cc5 100644
--- a/include/widgets/darrowrectangle.h
+++ b/include/widgets/darrowrectangle.h
@@ -11,13 +11,9 @@
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QPainter>
-#include <QTimer>
-#include <QDebug>
 
 #include <DObject>
 #include <dtkwidget_global.h>
-#include <DThemeManager>
-#include <dgraphicsgloweffect.h>
 #include <DBlurEffectWidget>
 
 DWIDGET_BEGIN_NAMESPACE
diff --git a/include/widgets/dloadingindicator.h b/include/widgets/dloadingindicator.h
index 52c83e631..87d1d1efe 100644
--- a/include/widgets/dloadingindicator.h
+++ b/include/widgets/dloadingindicator.h
@@ -15,7 +15,6 @@
 #include <QGraphicsPixmapItem>
 #include <QGraphicsView>
 #include <QEasingCurve>
-#include <QDebug>
 
 #include <dtkwidget_global.h>
 #include <DObject>
diff --git a/src/widgets/darrowrectangle.cpp b/src/widgets/darrowrectangle.cpp
index dc340f528..9fb56dda2 100644
--- a/src/widgets/darrowrectangle.cpp
+++ b/src/widgets/darrowrectangle.cpp
@@ -6,6 +6,7 @@
 #include "dplatformwindowhandle.h"
 #include "dapplication.h"
 #include "private/darrowrectangle_p.h"
+#include "dgraphicsgloweffect.h"
 #include "dstyle.h"
 
 #include <DGuiApplicationHelper>
diff --git a/src/widgets/dcrumbedit.cpp b/src/widgets/dcrumbedit.cpp
index 2cad870f3..41bb51f81 100644
--- a/src/widgets/dcrumbedit.cpp
+++ b/src/widgets/dcrumbedit.cpp
@@ -306,8 +306,6 @@ class DCrumbEditPrivate : public DCORE_NAMESPACE::DObjectPrivate
 
     void registerHandler(QAbstractTextDocumentLayout *layout)
     {
-        D_Q(DCrumbEdit);
-
         for (int i = QTextFormat::UserObject + 1; ; ++i) {
             if (!layout->handlerForObject(i)) {
                 objectType = i;
@@ -379,7 +377,9 @@ class DCrumbEditPrivate : public DCORE_NAMESPACE::DObjectPrivate
         if (cursor.charFormat().objectType() != objectType)
             return false;
 
-        DCrumbTextFormat format(cursor.charFormat());
+        auto fmt = q->document()->documentLayout()->formatAt(mousePos);
+        DCrumbTextFormat format = formats.value(fmt.stringProperty(QTextFormat::UserProperty + 1));
+
         currentText = format.text();
         currentBrush = format.background();
 
@@ -391,7 +391,8 @@ class DCrumbEditPrivate : public DCORE_NAMESPACE::DObjectPrivate
 
         makeCrumb();
 
-        if (mousePos.x() < q->cursorRect().left())
+        if (mousePos.x() < q->cursorRect().left() ||
+            mousePos.y() < q->cursorRect().top())
             cursor.setPosition(cursor.position() - 1, QTextCursor::KeepAnchor);
         else
             cursor.setPosition(cursor.position() + 1, QTextCursor::KeepAnchor);