diff --git a/src/DockAreaTabBar.cpp b/src/DockAreaTabBar.cpp
index 2dfa2ec..842e3da 100644
--- a/src/DockAreaTabBar.cpp
+++ b/src/DockAreaTabBar.cpp
@@ -138,6 +138,8 @@ CDockAreaTabBar::CDockAreaTabBar(CDockAreaWidget* parent) :
 	d->TabsLayout->addStretch(1);
 	d->TabsContainerWidget->setLayout(d->TabsLayout);
 	setWidget(d->TabsContainerWidget);
+
+    setFocusPolicy(Qt::NoFocus);
 }
 
 
diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp
index 99f977a..8d13690 100644
--- a/src/DockAreaTitleBar.cpp
+++ b/src/DockAreaTitleBar.cpp
@@ -269,6 +269,8 @@ CDockAreaTitleBar::CDockAreaTitleBar(CDockAreaWidget* parent) :
 	d->createTabBar();
 	d->Layout->addWidget(new CSpacerWidget(this));
 	d->createButtons();
+
+    setFocusPolicy(Qt::NoFocus);
 }
 
 
@@ -606,7 +608,7 @@ CTitleBarButton::CTitleBarButton(bool visible, QWidget* parent)
 	  Visible(visible),
 	  HideWhenDisabled(CDockManager::testConfigFlag(CDockManager::DockAreaHideDisabledButtons))
 {
-
+    setFocusPolicy(Qt::NoFocus);
 }
 
 //============================================================================
diff --git a/src/DockFocusController.cpp b/src/DockFocusController.cpp
index a4a6eba..b3efcee 100644
--- a/src/DockFocusController.cpp
+++ b/src/DockFocusController.cpp
@@ -44,6 +44,7 @@ struct DockFocusControllerPrivate
      QPointer<CFloatingDockContainer> FloatingWidget = nullptr;
 #endif
 	CDockManager* DockManager;
+    bool ForceFocusChangedSignal = false;
 
 	/**
 	 * Private data constructor
@@ -161,11 +162,12 @@ void DockFocusControllerPrivate::updateDockWidgetFocus(CDockWidget* DockWidget)
     }
 #endif
 
-    if (old == DockWidget)
+    if (old == DockWidget && !ForceFocusChangedSignal)
     {
     	return;
     }
 
+    ForceFocusChangedSignal = false;
     if (DockWidget->isVisible())
     {
     	emit DockManager->focusedDockWidgetChanged(old, DockWidget);
@@ -243,15 +245,18 @@ void CDockFocusController::onApplicationFocusChanged(QWidget* focusedOld, QWidge
 	auto DockWidgetTab = qobject_cast<CDockWidgetTab*>(focusedNow);
 	if (DockWidgetTab)
 	{
-		DockWidget = DockWidgetTab->dockWidget();
-		// If the DockWidgetTab "steals" the focus from a widget in the same
-		// DockWidget, then we immediately give the focus back to the previous
-		// focused widget focusedOld
-		if (DockWidget == d->FocusedDockWidget && focusedOld && focusedOld != focusedNow)
-		{
-			focusedOld->setFocus();
-			return;
-		}
+		DockWidget = DockWidgetTab->dockWidget();      
+        // If the DockWidgetTab "steals" the focus from a widget in the same
+        // DockWidget, then we immediately give the focus back to the previous
+        // focused widget focusedOld
+        if (focusedOld)
+        {
+            auto OldFocusedDockWidget = internal::findParent<CDockWidget*>(focusedOld);
+            if (OldFocusedDockWidget && OldFocusedDockWidget == DockWidget)
+            {
+                focusedOld->setFocus();
+            }
+        }
 	}
 
 	if (!DockWidget)
@@ -322,6 +327,7 @@ void CDockFocusController::notifyWidgetOrAreaRelocation(QWidget* DroppedWidget)
 	CDockWidget* DockWidget = qobject_cast<CDockWidget*>(DroppedWidget);
 	if (DockWidget)
 	{
+        d->ForceFocusChangedSignal = true;
 		CDockManager::setWidgetFocus(DockWidget->tabWidget());
 		return;
 	}
@@ -333,6 +339,7 @@ void CDockFocusController::notifyWidgetOrAreaRelocation(QWidget* DroppedWidget)
 	}
 
 	DockWidget = DockArea->currentDockWidget();
+    d->ForceFocusChangedSignal = true;
 	CDockManager::setWidgetFocus(DockWidget->tabWidget());
 }