diff --git a/python/src/META-INF/python-core-common.xml b/python/src/META-INF/python-core-common.xml
index c4789dc5e331..8eaa4271b9fc 100644
--- a/python/src/META-INF/python-core-common.xml
+++ b/python/src/META-INF/python-core-common.xml
@@ -344,6 +344,7 @@
 
     <consoleHistoryModelProvider implementation="com.jetbrains.python.console.PyConsoleHistoryModelProvider"/>
     <scratch.rootType implementation="com.jetbrains.python.console.PyConsoleRootType" />
+    <consoleFilterProvider implementation="com.jetbrains.python.run.PyMessageFilterProvider"/>
 
     <!-- Run Anything -->
     <runAnything.executionProvider order="after RunAnythingRunConfigurationProvider" implementation="com.jetbrains.python.run.runAnything.PyRunAnythingProvider"/>
diff --git a/python/src/com/jetbrains/python/run/PyMessageFilterProvider.kt b/python/src/com/jetbrains/python/run/PyMessageFilterProvider.kt
new file mode 100644
index 000000000000..f36ca8f85d8e
--- /dev/null
+++ b/python/src/com/jetbrains/python/run/PyMessageFilterProvider.kt
@@ -0,0 +1,9 @@
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.jetbrains.python.run
+
+import com.intellij.execution.filters.ConsoleFilterProvider
+import com.intellij.openapi.project.Project
+
+class PyMessageFilterProvider : ConsoleFilterProvider {
+  override fun getDefaultFilters(project: Project) = arrayOf(PythonTracebackFilter(project))
+}
\ No newline at end of file
diff --git a/python/src/com/jetbrains/python/run/PythonTracebackFilter.java b/python/src/com/jetbrains/python/run/PythonTracebackFilter.java
index 7dba740bae1b..75541d2b54f3 100644
--- a/python/src/com/jetbrains/python/run/PythonTracebackFilter.java
+++ b/python/src/com/jetbrains/python/run/PythonTracebackFilter.java
@@ -37,7 +37,7 @@ public class PythonTracebackFilter implements Filter {
 
   public PythonTracebackFilter(final Project project) {
     myProject = project;
-    myWorkingDirectory = null;
+    myWorkingDirectory = project.getBasePath();
   }
 
   public PythonTracebackFilter(final Project project, @Nullable final String workingDirectory) {