diff --git a/src/gui/qgsfilterlineedit.cpp b/src/gui/qgsfilterlineedit.cpp
index dd7f52ab403..99394dd9116 100644
--- a/src/gui/qgsfilterlineedit.cpp
+++ b/src/gui/qgsfilterlineedit.cpp
@@ -107,7 +107,12 @@ void QgsFilterLineEdit::clearValue()
     case ClearToDefault:
       setText( mDefaultValue );
       break;
+  }
 
+  if ( mClearHover )
+  {
+    setCursor( Qt::IBeamCursor );
+    mClearHover = false;
   }
 
   setModified( true );
@@ -151,6 +156,12 @@ void QgsFilterLineEdit::onTextChanged( const QString &text )
     setStyleSheet( mStyleSheet );
     emit valueChanged( text );
   }
+
+  if ( mClearHover && !shouldShowClear() )
+  {
+    setCursor( Qt::IBeamCursor );
+    mClearHover = false;
+  }
 }
 
 bool QgsFilterLineEdit::shouldShowClear() const