diff --git a/src/Gui/FileDialog.cpp b/src/Gui/FileDialog.cpp
index 39aff4a0a..503a0d2b6 100644
--- a/src/Gui/FileDialog.cpp
+++ b/src/Gui/FileDialog.cpp
@@ -25,6 +25,7 @@
 #ifndef _PreComp_
 # include <QApplication>
 # include <QButtonGroup>
+# include <QCompleter>
 # include <QComboBox>
 # include <QDesktopServices>
 # include <QGridLayout>
@@ -521,7 +522,14 @@ FileChooser::FileChooser ( QWidget * parent )
     layout->setMargin( 0 );
     layout->setSpacing( 6 );
 
-    lineEdit = new QLineEdit( this );
+    lineEdit = new QLineEdit ( this );
+    completer = new QCompleter ( this );
+    completer->setMaxVisibleItems( 12 );
+    fs_model = new QFileSystemModel( completer );
+    fs_model->setRootPath(QString::fromUtf8(""));
+    completer->setModel( fs_model );
+    lineEdit->setCompleter( completer );
+
     layout->addWidget( lineEdit );
 
     connect(lineEdit, SIGNAL(textChanged(const QString &)),
diff --git a/src/Gui/FileDialog.h b/src/Gui/FileDialog.h
index 1ba5714e2..e5c5948eb 100644
--- a/src/Gui/FileDialog.h
+++ b/src/Gui/FileDialog.h
@@ -26,6 +26,8 @@
 
 #include <QFileDialog>
 #include <QFileIconProvider>
+#include <QFileSystemModel>
+#include <QCompleter>
 
 class QButtonGroup;
 class QGridLayout;
@@ -177,6 +179,8 @@ private Q_SLOTS:
 
 private:
     QLineEdit *lineEdit;
+    QCompleter *completer;
+    QFileSystemModel *fs_model;
     QPushButton *button;
     Mode md;
     QString _filter;