diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 2aa2c82aaa30141e3f88a8d7c1fa8844b1b70ecd..e4baf812353e3876735c6db64be8d341f69bd57f 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -475,6 +475,17 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption
                     QColor lighter(255, 255, 255, 37);
                     painter->fillRect(rect, lighter);
                 }
+                if (option->state & State_HasFocus && (option->state & State_KeyboardFocusChange)) {
+                    QColor highlight = option->palette.highlight().color();
+                    highlight.setAlphaF(0.4);
+                    painter->setPen(QPen(highlight.lighter(), 1));
+                    highlight.setAlphaF(0.3);
+                    painter->setBrush(highlight);
+                    painter->setRenderHint(QPainter::Antialiasing);
+                    QRectF rect = option->rect;
+                    rect.translate(0.5, 0.5);
+                    painter->drawRoundedRect(rect.adjusted(2, 2, -3, -3), 2, 2);
+                }
            }
         }
         break;
@@ -819,24 +830,6 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti
                 drawPrimitive(PE_PanelButtonTool, &tool, painter, widget);
             }
 
-            if (toolbutton->state & State_HasFocus) {
-                QStyleOptionFocusRect fr;
-                fr.QStyleOption::operator=(*toolbutton);
-                fr.rect.adjust(3, 3, -3, -3);
-                if (toolbutton->features & QStyleOptionToolButton::MenuButtonPopup)
-                    fr.rect.adjust(0, 0, -pixelMetric(QStyle::PM_MenuButtonIndicator,
-                                                      toolbutton, widget), 0);
-                QPen oldPen = painter->pen();
-                QColor focusColor = Utils::StyleHelper::panelTextColor();
-                focusColor.setAlpha(120);
-                QPen outline(focusColor, 1);
-                outline.setStyle(Qt::DotLine);
-                painter->setPen(outline);
-                QRect r = option->rect.adjusted(2, 2, -2, -2);
-                painter->drawRect(r);
-                painter->setPen(oldPen);
-            }
-
             QStyleOptionToolButton label = *toolbutton;
 
             label.palette = panelPalette(option->palette, lightColored(widget));
@@ -938,6 +931,7 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti
             } else {
                 drawPrimitive(PE_IndicatorArrowDown, &arrowOpt, painter, widget);
             }
+
             painter->restore();
         }
         break;
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 8ba5e69fde51d6be68d5a02bfee27d543b58e3c1..044c2e139bac60bf225a4355cc07ffe49a6723bb 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -376,6 +376,7 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget)
 
     m_navigationComboBox = new NavComboBox(this);
     m_navigationComboBox->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
+    m_navigationComboBox->setFocusPolicy(Qt::TabFocus);
     m_navigationComboBox->setMinimumContentsLength(0);
     m_navigationWidget = 0;
 
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
index 180a4ed724dbbd30a56df4ad697cc9beb757335b..31b33d56737514c4285f159843fd7424bb8086a0 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
@@ -385,6 +385,7 @@ MiniProjectTargetSelector::MiniProjectTargetSelector(QAction *targetSelectorActi
     bar->setFixedHeight(panelHeight);
 
     m_projectsBox = new QComboBox;
+    m_projectsBox->setFocusPolicy(Qt::TabFocus);
     f.setBold(false);
     m_projectsBox->setFont(f);
     m_projectsBox->ensurePolished();