diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 11536d60f4..a921c64615 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -3141,7 +3141,6 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 
 		rv->get_canvas_frame()->get_bounds (ix1, iy1, ix2, iy2);
 		rv->get_canvas_group()->i2w (ix1, iy1);
-		rv->region()->set_opaque(false);
 		TimeAxisView* tvp2 = trackview_by_y_position (iy1);
 		AudioTimeAxisView* canvas_atv = dynamic_cast<AudioTimeAxisView*>(tvp2);
 		AudioTimeAxisView* temp_atv;
@@ -3249,6 +3248,7 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 					}
 				}
 			}
+			rv->region()->set_opaque(false);
 		}
 
 		if (drag_info.brushing) {
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index e748b44824..77aee9392d 100644
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -1385,6 +1385,10 @@ Playlist::set_state (const XMLNode& node)
 		} 			
 	}
 	
+	notify_modified ();
+
+	thaw ();
+
  	/* update dependents, which was not done during add_region_internal 
 	   due to in_set_state being true 
 	*/
@@ -1393,10 +1397,6 @@ Playlist::set_state (const XMLNode& node)
 		check_dependents (*r, false);
 	}
 
-	notify_modified ();
-
-	thaw ();
-
 	in_set_state--;
 
 	return 0;