diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c
index 06ff061f5ea..e8731391352 100644
--- a/source/blender/editors/space_action/space_action.c
+++ b/source/blender/editors/space_action/space_action.c
@@ -365,8 +365,13 @@ static void action_listener(ScrArea *sa, wmNotifier *wmn)
 			}
 			break;
 		case NC_ANIMATION:
+			/* for NLA tweakmode enter/exit, need complete refresh */
+			if (wmn->data == ND_NLA_ACTCHANGE) {
+				saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
+				ED_area_tag_refresh(sa);
+			}
 			/* for selection changes of animation data, we can just redraw... otherwise autocolor might need to be done again */
-			if (ELEM(wmn->data, ND_KEYFRAME, ND_ANIMCHAN) && (wmn->action == NA_SELECTED))
+			else if (ELEM(wmn->data, ND_KEYFRAME, ND_ANIMCHAN) && (wmn->action == NA_SELECTED))
 				ED_area_tag_redraw(sa);
 			else
 				ED_area_tag_refresh(sa);
@@ -416,9 +421,9 @@ static void action_listener(ScrArea *sa, wmNotifier *wmn)
 static void action_header_area_listener(ARegion *ar, wmNotifier *wmn)
 {
 	/* context changes */
-	switch(wmn->category) {
+	switch (wmn->category) {
 		case NC_SCENE:
-			switch(wmn->data) {
+			switch (wmn->data) {
 				case ND_OB_ACTIVE:
 					ED_region_tag_redraw(ar);
 					break;