diff --git a/src/app/ui_context.cpp b/src/app/ui_context.cpp
index eb739b2de..ba5d4b773 100644
--- a/src/app/ui_context.cpp
+++ b/src/app/ui_context.cpp
@@ -25,6 +25,7 @@
 #include "app/ui/workspace.h"
 #include "app/ui/workspace_tabs.h"
 #include "doc/sprite.h"
+#include "ui/manager.h"
 #include "ui/system.h"
 
 #include <algorithm>
@@ -120,6 +121,10 @@ void UIContext::setActiveView(DocView* docView)
   mainWin->getTimeline()->updateUsingEditor(editor);
   mainWin->getPreviewEditor()->updateUsingEditor(editor);
 
+  // Update mouse widgets immediately after changing views rather
+  // than waiting for mouse movement.
+  mainWin->manager()->_updateMouseWidgets();
+
   // Change the image-type of color bar.
   ColorBar::instance()->setPixelFormat(app_get_current_pixel_format());