diff --git a/src/Gui/PythonConsole.cpp b/src/Gui/PythonConsole.cpp
index cc4f66ffb..c46479022 100644
--- a/src/Gui/PythonConsole.cpp
+++ b/src/Gui/PythonConsole.cpp
@@ -392,7 +392,7 @@ PythonConsole::PythonConsole(QWidget *parent)
     "Type 'help', 'copyright', 'credits' or 'license' for more information.")
     .arg(QString::fromAscii(version)).arg(QString::fromAscii(platform));
     d->output = d->info;
-    printPrompt(false);
+    printPrompt(PythonConsole::Complete);
 }
 
 /** Destroys the object and frees any allocated resources */
@@ -504,7 +504,9 @@ void PythonConsole::keyPressEvent(QKeyEvent * e)
                   d->history.append( QLatin1String("# ") + inputLine );  //< put line to history ...
                   inputLineBegin.insertText( QString::fromAscii("# ") ); //< but comment it on console
                   setTextCursor( inputLineBegin );
-                  printPrompt( d->interpreter->hasPendingInput() );      //< print adequate prompt
+                  printPrompt(d->interpreter->hasPendingInput()      //< print adequate prompt
+                      ? PythonConsole::Incomplete
+                      : PythonConsole::Complete);
               }
           }   break;
 
@@ -600,10 +602,15 @@ void PythonConsole::insertPythonError ( const QString& err )
     d->error += err;
 }
 
+void PythonConsole::onFlush()
+{
+    printPrompt(PythonConsole::Flush);
+}
+
 /** Prints the ps1 prompt (>>> ) for complete and ps2 prompt (... ) for
  * incomplete commands to the console window. 
  */ 
-void PythonConsole::printPrompt(bool incomplete)
+void PythonConsole::printPrompt(PythonConsole::Prompt mode)
 {
     // write normal messages
     if (!d->output.isEmpty()) {
@@ -632,8 +639,15 @@ void PythonConsole::printPrompt(bool incomplete)
     else
         block.setUserState(0);
 
-    incomplete ? cursor.insertText(QString::fromAscii("... "))
-               : cursor.insertText(QString::fromAscii(">>> "));
+    switch (mode)
+    {
+    case PythonConsole::Incomplete:
+        cursor.insertText(QString::fromAscii("... "));
+    case PythonConsole::Complete:
+        cursor.insertText(QString::fromAscii(">>> "));
+    default:
+        break;
+    }
     cursor.endEditBlock();
 
     // move cursor to the end
@@ -706,9 +720,10 @@ void PythonConsole::runSource(const QString& line)
         QMessageBox::critical(this, tr("Python console"), tr("Unhandled unknown C++ exception."));
     }
 
+    printPrompt(incomplete ? PythonConsole::Incomplete
+                           : PythonConsole::Complete);
     PySys_SetObject("stdout", default_stdout);
     PySys_SetObject("stderr", default_stderr);
-    printPrompt(incomplete);
     d->interactive = false;
     for (QStringList::Iterator it = d->statements.begin(); it != d->statements.end(); ++it)
         printStatement(*it);
@@ -751,7 +766,7 @@ void PythonConsole::printStatement( const QString& cmd )
         cursor.movePosition(QTextCursor::End);
         cursor.insertText( *it );
         d->history.append( *it );
-        printPrompt(false);
+        printPrompt(PythonConsole::Complete);
     }
 }
 
@@ -984,7 +999,7 @@ void PythonConsole::runSourceFromMimeData(const QString& source)
         buffer.append(line);
         int ret = d->interpreter->compileCommand(buffer.join(QLatin1String("\n")).toUtf8());
         if (ret == 1) { // incomplete
-            printPrompt(true);
+            printPrompt(PythonConsole::Incomplete);
         }
         else if (ret == 0) { // complete
             // check if the following lines belong to the previous block
@@ -1001,7 +1016,7 @@ void PythonConsole::runSourceFromMimeData(const QString& source)
             // is finished
             if (ret == -1) {
                 // the command is not finished yet
-                printPrompt(true);
+                printPrompt(PythonConsole::Incomplete);
             }
             else {
                 runSource(buffer.join(QLatin1String("\n")));
@@ -1094,7 +1109,7 @@ void PythonConsole::onClearConsole()
 {
     clear();
     d->output = d->info;
-    printPrompt(false);
+    printPrompt(PythonConsole::Complete);
 }
 
 void PythonConsole::onSaveHistoryAs()
@@ -1312,6 +1327,7 @@ PythonInputField::PythonInputField(QWidget* parent)
 
     editField = new PythonEditor(this);
     gridLayout->addWidget(editField, 0, 0, 1, 1);
+    setFocusProxy(editField);
 
     QHBoxLayout* hboxLayout = new QHBoxLayout();
     hboxLayout->setSpacing(6);
diff --git a/src/Gui/PythonConsole.h b/src/Gui/PythonConsole.h
index c4d4385eb..9ac632adf 100644
--- a/src/Gui/PythonConsole.h
+++ b/src/Gui/PythonConsole.h
@@ -96,6 +96,12 @@ class GuiExport PythonConsole : public TextEdit, public WindowParameter
     Q_OBJECT
 
 public:
+    enum Prompt {
+        Complete   = 0,
+        Incomplete = 1,
+        Flush      = 2
+    };
+
     PythonConsole(QWidget *parent = 0);
     ~PythonConsole();
 
@@ -108,6 +114,7 @@ public Q_SLOTS:
     void onCopyHistory();
     void onCopyCommand();
     void onClearConsole();
+    void onFlush();
 
 private Q_SLOTS:
     void visibilityChanged (bool visible);
@@ -131,7 +138,7 @@ protected:
 private:
     void runSource(const QString&);
     bool isComment(const QString&) const;
-    void printPrompt(bool);
+    void printPrompt(Prompt);
     void insertPythonOutput(const QString&);
     void insertPythonError (const QString&);
     void runSourceFromMimeData(const QString&);
diff --git a/src/Gui/PythonConsolePy.cpp b/src/Gui/PythonConsolePy.cpp
index 34d409317..5e9d18817 100644
--- a/src/Gui/PythonConsolePy.cpp
+++ b/src/Gui/PythonConsolePy.cpp
@@ -26,6 +26,7 @@
 # include <QByteArray>
 # include <QInputDialog>
 # include <QEventLoop>
+# include <QTimer>
 #endif
 
 #include "PythonConsolePy.h"
@@ -292,12 +293,18 @@ PythonStdin::PythonStdin(PythonConsole *pc)
   : pyConsole(pc)
 {
     editField = new PythonInputField(/*getMainWindow()*/);
+    timer = new QTimer();
+    timer->setInterval(250);
+    QObject::connect(timer, SIGNAL(timeout()),
+                     editField, SLOT(hide()));
+    console = getMainWindow()->findChild<PythonConsole*>();
 }
 
 PythonStdin::~PythonStdin()
 {
     // call deleteLater() because deleting immediately causes problems
     editField->deleteLater();
+    timer->deleteLater();
 }
 
 Py::Object PythonStdin::repr()
@@ -310,14 +317,16 @@ Py::Object PythonStdin::repr()
 
 Py::Object PythonStdin::readline(const Py::Tuple& args)
 {
+    if (console)
+        console->onFlush();
+    timer->stop();
     QEventLoop loop;
     QObject::connect(editField, SIGNAL(textEntered()), &loop, SLOT(quit()));
     editField->clear();
     editField->show();
+    editField->setFocus();
     loop.exec();
     QString txt = editField->getText();
-    if (txt.isEmpty())
-        editField->hide();
-
+    timer->start();
     return Py::String((const char*)txt.toAscii());
 }
diff --git a/src/Gui/PythonConsolePy.h b/src/Gui/PythonConsolePy.h
index a05e102c8..63cc34284 100644
--- a/src/Gui/PythonConsolePy.h
+++ b/src/Gui/PythonConsolePy.h
@@ -26,6 +26,8 @@
 
 #include <CXX/Extensions.hxx>
 
+class QTimer;
+
 namespace Gui {
 class PythonConsole;
 class PythonInputField;
@@ -140,6 +142,8 @@ public:
 
 private:
     PythonInputField* editField;
+    PythonConsole* console;
+    QTimer* timer;
 };
 
 } // namespace Gui