diff --git a/docs/changes.txt b/docs/changes.txt
index 674d97d92e..2470bcba29 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -70,6 +70,7 @@ All (GUI):
 - Add support for wxAuiManager and wxAuiPaneInfo to XRC (Andrea Zanellato).
 - Add support for wxSL_MIN_MAX_LABELS and wxSL_VALUE_LABEL to XRC (ousnius).
 - Update Scintilla to v3.6.3 (Paul Kulchenko).
+- Fix bug with not being able to select AUI tab after dragging.
 - Make wxDataViewCtrl::Expand() expand ancestors in native ports too.
 - Add wxDataViewCtrl::SetHeaderAttr().
 - Add wxListCtrl::SetHeaderAttr().
diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index 1d9ac95e9f..df98c33e87 100644
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -2678,7 +2678,10 @@ void wxAuiNotebook::OnTabEndDrag(wxAuiNotebookEvent& evt)
     wxPoint mouse_screen_pt = ::wxGetMousePosition();
     wxPoint mouse_client_pt = ScreenToClient(mouse_screen_pt);
 
-
+    // Update our selection (it may be updated again below but the code below
+    // can also return without doing anything else and this ensures that the
+    // selection is updated even then).
+    m_curPage = src_tabs->GetActivePage();
 
     // check for an external move
     if (m_flags & wxAUI_NB_TAB_EXTERNAL_MOVE)