Index: ash/wm/panels/panel_layout_manager.cc |
diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc |
index cc521f4331002efee68547033acef460317d9832..b07b7362e933d31669b951753f3cf5f649d627fd 100644 |
--- a/ash/wm/panels/panel_layout_manager.cc |
+++ b/ash/wm/panels/panel_layout_manager.cc |
@@ -608,8 +608,10 @@ void PanelLayoutManager::Relayout() { |
} |
// If the shelf is currently hidden (full-screen mode), minimize panel until |
- // full-screen mode is exited. |
- if (restore_windows_on_shelf_visible_) { |
+ // full-screen mode is exited. When a panel is dragged from another display |
+ // the shelf state does not update before the panel is added so we exclude |
+ // the dragged panel. |
+ if (panel != dragged_panel_ && restore_windows_on_shelf_visible_) { |
wm::GetWindowState(panel)->Minimize(); |
restore_windows_on_shelf_visible_->Add(panel); |
continue; |