diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index a37d1071a..ebd3eb764 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -55,7 +55,7 @@ namespace CSVRender
         timer->start (20); ///< \todo make this configurable
 
         /// \todo make shortcut configurable
-        QShortcut *focusToolbar = new QShortcut (Qt::Key_T, this);
+        QShortcut *focusToolbar = new QShortcut (Qt::Key_T, this, 0, 0, Qt::WidgetWithChildrenShortcut);
         connect (focusToolbar, SIGNAL (activated()), this, SIGNAL (focusToolbarRequest()));
     }
 
diff --git a/apps/opencs/view/widget/scenetoolbar.cpp b/apps/opencs/view/widget/scenetoolbar.cpp
index f06c856cb..eac9bcec3 100644
--- a/apps/opencs/view/widget/scenetoolbar.cpp
+++ b/apps/opencs/view/widget/scenetoolbar.cpp
@@ -2,6 +2,7 @@
 #include "scenetoolbar.hpp"
 
 #include <QVBoxLayout>
+#include <QShortcut>
 
 #include "scenetool.hpp"
 
@@ -24,6 +25,10 @@ CSVWidget::SceneToolbar::SceneToolbar (int buttonSize, QWidget *parent)
     mLayout->setContentsMargins (QMargins (0, 0, 0, 0));
 
     setLayout (mLayout);
+
+    /// \todo make shortcut configurable
+    QShortcut *focusScene = new QShortcut (Qt::Key_T, this, 0, 0, Qt::WidgetWithChildrenShortcut);
+    connect (focusScene, SIGNAL (activated()), this, SIGNAL (focusSceneRequest()));
 }
 
 void CSVWidget::SceneToolbar::addTool (SceneTool *tool)
@@ -39,4 +44,4 @@ int CSVWidget::SceneToolbar::getButtonSize() const
 int CSVWidget::SceneToolbar::getIconSize() const
 {
     return mIconSize;
-}
\ No newline at end of file
+}
diff --git a/apps/opencs/view/widget/scenetoolbar.hpp b/apps/opencs/view/widget/scenetoolbar.hpp
index bd609078d..1902ba2be 100644
--- a/apps/opencs/view/widget/scenetoolbar.hpp
+++ b/apps/opencs/view/widget/scenetoolbar.hpp
@@ -30,6 +30,10 @@ namespace CSVWidget
             int getButtonSize() const;
 
             int getIconSize() const;
+
+        signals:
+
+            void focusSceneRequest();
     };
 }
 
diff --git a/apps/opencs/view/world/previewsubview.cpp b/apps/opencs/view/world/previewsubview.cpp
index 599e9cb9d..1e106c69f 100644
--- a/apps/opencs/view/world/previewsubview.cpp
+++ b/apps/opencs/view/world/previewsubview.cpp
@@ -47,6 +47,7 @@ CSVWorld::PreviewSubView::PreviewSubView (const CSMWorld::UniversalId& id, CSMDo
     connect (mScene, SIGNAL (referenceableIdChanged (const std::string&)),
         this, SLOT (referenceableIdChanged (const std::string&)));
     connect (mScene, SIGNAL (focusToolbarRequest()), toolbar, SLOT (setFocus()));
+    connect (toolbar, SIGNAL (focusSceneRequest()), mScene, SLOT (setFocus()));
 }
 
 void CSVWorld::PreviewSubView::setEditLock (bool locked) {}
diff --git a/apps/opencs/view/world/scenesubview.cpp b/apps/opencs/view/world/scenesubview.cpp
index 60988e1bb..dc1525b05 100644
--- a/apps/opencs/view/world/scenesubview.cpp
+++ b/apps/opencs/view/world/scenesubview.cpp
@@ -239,6 +239,7 @@ void CSVWorld::SceneSubView::replaceToolbarAndWorldspace (CSVRender::WorldspaceW
     mToolbar = toolbar;
 
     connect (mScene, SIGNAL (focusToolbarRequest()), mToolbar, SLOT (setFocus()));
+    connect (mToolbar, SIGNAL (focusSceneRequest()), mScene, SLOT (setFocus()));
 
     mLayout->addWidget (mToolbar, 0);
     mLayout->addWidget (mScene, 1);