diff --git a/plugins/konsole/CMakeLists.txt b/plugins/konsole/CMakeLists.txt
index 0c73c15f2e..cf0e490bcc 100644
--- a/plugins/konsole/CMakeLists.txt
+++ b/plugins/konsole/CMakeLists.txt
@@ -1,15 +1,15 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"kdevkonsole\")
 ########### next target ###############
 
 set(kdevkonsoleview_PART_SRCS
     kdevkonsoleviewplugin.cpp
     kdevkonsoleview.cpp
 )
 
 ecm_qt_declare_logging_category(kdevkonsoleview_PART_SRCS
     HEADER debug.h
     IDENTIFIER PLUGIN_KONSOLE
     CATEGORY_NAME "kdevelop.plugins.konsole"
 )
 kdevplatform_add_plugin(kdevkonsoleview JSON kdevkonsoleview.json SOURCES ${kdevkonsoleview_PART_SRCS})
-target_link_libraries(kdevkonsoleview KF5::Parts KDev::Interfaces)
+target_link_libraries(kdevkonsoleview KF5::Parts KDev::Interfaces KDev::Util)
diff --git a/plugins/konsole/kdevkonsoleview.cpp b/plugins/konsole/kdevkonsoleview.cpp
index 899571ed51..f7314633c4 100644
--- a/plugins/konsole/kdevkonsoleview.cpp
+++ b/plugins/konsole/kdevkonsoleview.cpp
@@ -1,153 +1,167 @@
 /***************************************************************************
 *   Copyright 2003, 2006 Adam Treat <treat@kde.org>                       *
 *   Copyright 2007 Andreas Pakulat <apaku@gmx.de>                         *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 
 #include "kdevkonsoleview.h"
 #include "debug.h"
 
 #include <QFrame>
 #include <QIcon>
 #include <QKeyEvent>
 #include <QUuid>
 #include <QVBoxLayout>
 
 #include <kde_terminal_interface.h>
 #include <KLocalizedString>
 #include <KPluginFactory>
 #include <KParts/ReadOnlyPart>
 
 #include <interfaces/icore.h>
 #include <interfaces/isession.h>
+#include <interfaces/idocumentcontroller.h>
+#include <interfaces/iprojectcontroller.h>
+#include <interfaces/iproject.h>
+#include <util/path.h>
 
 #include "kdevkonsoleviewplugin.h"
 
 class KDevKonsoleViewPrivate
 {
 public:
     KDevKonsoleViewPlugin* mplugin;
     KDevKonsoleView* m_view;
     KParts::ReadOnlyPart *konsolepart;
     QVBoxLayout *m_vbox;
     // TODO: remove this once we can depend on a Qt version that includes https://codereview.qt-project.org/#/c/83800/
     QMetaObject::Connection m_partDestroyedConnection;
 
     void _k_slotTerminalClosed();
 
     void init( KPluginFactory* factory )
     {
         Q_ASSERT( konsolepart == nullptr );
 
         Q_ASSERT( factory != nullptr );
 
         if ( ( konsolepart = factory->create<KParts::ReadOnlyPart>( m_view ) ) )
         {
             QObject::disconnect(m_partDestroyedConnection);
             m_partDestroyedConnection = QObject::connect(konsolepart, &KParts::ReadOnlyPart::destroyed,
                                                          m_view, [&] { _k_slotTerminalClosed(); });
 
             konsolepart->widget() ->setFocusPolicy( Qt::WheelFocus );
             konsolepart->widget() ->setFocus();
             konsolepart->widget() ->installEventFilter( m_view );
 
             if ( QFrame * frame = qobject_cast<QFrame*>( konsolepart->widget() ) )
                 frame->setFrameStyle( QFrame::Panel | QFrame::Sunken );
 
             m_vbox->addWidget( konsolepart->widget() );
             m_view->setFocusProxy( konsolepart->widget() );
             konsolepart->widget() ->show();
 
             TerminalInterface* interface = qobject_cast<TerminalInterface*>(konsolepart);
             Q_ASSERT(interface);
 
-            interface->showShellInDir( QString() );
+            QString dir;
+            if (KDevelop::IDocument* activeDocument = KDevelop::ICore::self()->documentController()->activeDocument())
+            {
+                KDevelop::IProject* project = KDevelop::ICore::self()->projectController()->findProjectForUrl(activeDocument->url());
+                if (project && project->path().isLocalFile())
+                    dir = project->path().path();
+                else if (activeDocument->url().isLocalFile())
+                    dir = activeDocument->url().adjusted(QUrl::RemoveFilename).path(QUrl::FullyDecoded);
+            }
+            interface->showShellInDir( dir );
+
             interface->sendInput( " kdevelop! -s \"" + KDevelop::ICore::self()->activeSession()->id().toString() + "\"\n" );
 
         }else
         {
             qCDebug(PLUGIN_KONSOLE) << "Couldn't create KParts::ReadOnlyPart from konsole factory!";
         }
     }
 
     ~KDevKonsoleViewPrivate()
     {
         QObject::disconnect(m_partDestroyedConnection);
     }
 };
 
 void KDevKonsoleViewPrivate::_k_slotTerminalClosed()
 {
     konsolepart = nullptr;
     init( mplugin->konsoleFactory() );
 }
 
 KDevKonsoleView::KDevKonsoleView( KDevKonsoleViewPlugin *plugin, QWidget* parent )
         : QWidget( parent ), d(new KDevKonsoleViewPrivate)
 
 {
     d->mplugin = plugin;
     d->m_view = this;
     d->konsolepart = nullptr;
     setObjectName( i18n( "Konsole" ) );
 
     setWindowIcon( QIcon::fromTheme( QStringLiteral( "utilities-terminal" ), windowIcon() ) );
     setWindowTitle( i18n( "Konsole" ) );
 
     d->m_vbox = new QVBoxLayout( this );
     d->m_vbox->setMargin( 0 );
     d->m_vbox->setSpacing( 0 );
 
     d->init( d->mplugin->konsoleFactory() );
 
     //TODO Make this configurable in the future,
     // but by default the konsole shouldn't
     // automatically switch directories on you.
 
 //     connect( KDevelop::Core::documentController(), SIGNAL(documentActivated(KDevDocument*)),
 //              this, SLOT(documentActivated(KDevDocument*)) );
 }
 
 KDevKonsoleView::~KDevKonsoleView()
 {
     delete d;
 }
 
 void KDevKonsoleView::setDirectory( const QUrl &url )
 {
     if ( !url.isValid() || !url.isLocalFile() )
         return ;
 
     if ( d->konsolepart && url != d->konsolepart->url() )
         d->konsolepart->openUrl( url );
 }
 
 bool KDevKonsoleView::eventFilter( QObject* obj, QEvent *e )
 {
     switch( e->type() ) {
         case QEvent::ShortcutOverride: {
             QKeyEvent *k = static_cast<QKeyEvent *>(e);
 
             // Don't propagate Esc to the top level, it should be used by konsole
             if (k->key() == Qt::Key_Escape) {
                 if (d->konsolepart && d->konsolepart->widget()) {
                     e->accept();
                     return true;
                 }
             }
             break;
         }
 
         default:
             break;
     }
 
     return QWidget::eventFilter( obj, e );
 }
 
 #include "moc_kdevkonsoleview.cpp"