diff --git a/python/helpers/pydev/pydev_ipython_console.py b/python/helpers/pydev/pydev_ipython_console.py
index dca3b4dc53ee..d3d4ae8492a3 100644
--- a/python/helpers/pydev/pydev_ipython_console.py
+++ b/python/helpers/pydev/pydev_ipython_console.py
@@ -11,10 +11,10 @@ os.environ['TERM'] = 'emacs' #to use proper page_more() for paging
 #raise ImportError()
 
 try:
-    from pydev_ipython_console_010 import PyDevFrontEnd
-except:
     #IPython 0.11 broke compatibility...
     from pydev_ipython_console_011 import PyDevFrontEnd
+except:
+    from pydev_ipython_console_010 import PyDevFrontEnd
 
 #=======================================================================================================================
 # InterpreterInterface
diff --git a/python/helpers/pydev/pydev_ipython_console_011.py b/python/helpers/pydev/pydev_ipython_console_011.py
index da08bd136ab5..a6c0d8207a04 100644
--- a/python/helpers/pydev/pydev_ipython_console_011.py
+++ b/python/helpers/pydev/pydev_ipython_console_011.py
@@ -1,4 +1,7 @@
-from IPython.frontend.terminal.interactiveshell import TerminalInteractiveShell
+try:
+    from IPython.terminal.interactiveshell import TerminalInteractiveShell
+except ImportError:
+    from IPython.frontend.terminal.interactiveshell import TerminalInteractiveShell
 from IPython.utils import io
 import sys
 import codeop, re