diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp
index a5024e5..3beae3e 100644
--- a/src/DockAreaTitleBar.cpp
+++ b/src/DockAreaTitleBar.cpp
@@ -235,7 +235,7 @@ void DockAreaTitleBarPrivate::createButtons()
 #endif
 	_this->connect(TabsMenu, SIGNAL(aboutToShow()), SLOT(onTabsMenuAboutToShow()));
 	TabsMenuButton->setMenu(TabsMenu);
-	internal::setToolTip(TabsMenuButton, QObject::tr("List all tabs"));
+	internal::setToolTip(TabsMenuButton, QObject::tr("List All Tabs"));
 	TabsMenuButton->setSizePolicy(ButtonSizePolicy);
 	Layout->addWidget(TabsMenuButton, 0);
 	_this->connect(TabsMenuButton->menu(), SIGNAL(triggered(QAction*)),
diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
index 8666791..f2e5490 100644
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -398,6 +398,7 @@ void CDockAreaWidget::insertDockWidget(int index, CDockWidget* DockWidget,
 	bool Activate)
 {
 	d->ContentsLayout->insertWidget(index, DockWidget);
+	DockWidget->tabWidget()->setDockAreaWidget(this);
 	auto TabWidget = DockWidget->tabWidget();
 	// Inserting the tab will change the current index which in turn will
 	// make the tab widget visible in the slot
diff --git a/src/DockWidgetTab.cpp b/src/DockWidgetTab.cpp
index 3681d95..4e8323f 100644
--- a/src/DockWidgetTab.cpp
+++ b/src/DockWidgetTab.cpp
@@ -464,6 +464,20 @@ CDockWidget* CDockWidgetTab::dockWidget() const
 }
 
 
+//============================================================================
+void CDockWidgetTab::setDockAreaWidget(CDockAreaWidget* DockArea)
+{
+	d->DockArea = DockArea;
+}
+
+
+//============================================================================
+CDockAreaWidget* CDockWidgetTab::dockAreaWidget() const
+{
+	return d->DockArea;
+}
+
+
 //============================================================================
 void CDockWidgetTab::setIcon(const QIcon& Icon)
 {
diff --git a/src/DockWidgetTab.h b/src/DockWidgetTab.h
index 3bde672..b95c4ed 100644
--- a/src/DockWidgetTab.h
+++ b/src/DockWidgetTab.h
@@ -94,6 +94,19 @@ public:
 	 */
 	void setActiveTab(bool active);
 
+	/**
+	 * Sets the dock area widget the dockWidget returned by dockWidget()
+	 * function belongs to.
+	 */
+	void setDockAreaWidget(CDockAreaWidget* DockArea);
+
+	/**
+	 * Returns the dock area widget this title bar belongs to.
+	 * \return This function returns 0 if the dock widget that owns this title
+	 * bar widget has not been added to any dock area yet.
+	 */
+	CDockAreaWidget* dockAreaWidget() const;
+
 	/**
 	 * Returns the dock widget this title widget belongs to
 	 */