diff --git a/src/plugins/qmldesigner/components/propertyeditor/colorwidget.h b/src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
index cb18a5f8140f51854572332a7efafc0e6dde518c..2cfb5114d1b4cdb3d9cfaa42b438f78c1b3890bc 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
@@ -236,7 +236,7 @@ class BauhausColorDialog : public QFrame {
 
     Q_OBJECT
 
-    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)               
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
 
 public:
     BauhausColorDialog(QWidget *parent = 0);
diff --git a/src/plugins/qmldesigner/components/propertyeditor/filewidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/filewidget.cpp
index 41efca45a052515cf7f2d83eecd1ba858520c948..7bd2d1c276c2ffb610939ea3f8226b6a4ce685d8 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/filewidget.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/filewidget.cpp
@@ -117,10 +117,14 @@ void FileWidget::setFileName(const QUrl &fileName)
         return;
 
     m_fileName = fileName;
-    if (m_lineEdit->text() != fileName.toString())
+    if (m_lineEdit->text() != fileName.toString()) {
         m_lineEdit->setText(fileName.toString());
-    if (m_comboBox->currentText() != fileName.toString())
+        m_lineEdit->setToolTip(m_fileName.toString());
+    }
+    if (m_comboBox->currentText() != fileName.toString()) {
         m_comboBox->setEditText(m_fileName.toString());
+        m_comboBox->setToolTip(m_fileName.toString());
+    }
     emit fileNameChanged(fileName);
 }