2 files changed, 11 insertions, 1 deletions
diff --git a/src/dolphincolumnviewcontainer.cpp b/src/dolphincolumnviewcontainer.cpp
index fb8e5444c..c1b51280b 100644
--- a/src/dolphincolumnviewcontainer.cpp
+++ b/src/dolphincolumnviewcontainer.cpp
@@ -176,6 +176,15 @@ void DolphinColumnViewContainer::mousePressEvent(QMouseEvent* event)
     QScrollArea::mousePressEvent(event);
 }
 
+void DolphinColumnViewContainer::keyPressEvent(QKeyEvent* event)
+{
+    if (event->key() == Qt::Key_Left) {
+        setActiveColumnIndex(m_index - 1);
+    } else {
+        QScrollArea::keyPressEvent(event);
+    }
+}
+
 void DolphinColumnViewContainer::resizeEvent(QResizeEvent* event)
 {
     QScrollArea::resizeEvent(event);
@@ -224,7 +233,7 @@ void DolphinColumnViewContainer::updateColumnsBackground(bool active)
 
 void DolphinColumnViewContainer::setActiveColumnIndex(int index)
 {
-    if (m_index == index) {
+    if ((m_index == index) || (index < 0) || (index >= m_columns.count())) {
         return;
     }
 
diff --git a/src/dolphincolumnviewcontainer.h b/src/dolphincolumnviewcontainer.h
index 10c2905fa..72a65b4a9 100644
--- a/src/dolphincolumnviewcontainer.h
+++ b/src/dolphincolumnviewcontainer.h
@@ -67,6 +67,7 @@ signals:
 
 protected:
     virtual void mousePressEvent(QMouseEvent* event);
+    virtual void keyPressEvent(QKeyEvent* event);
     virtual void resizeEvent(QResizeEvent* event);
     virtual void wheelEvent(QWheelEvent* event);