diff --git a/Components/6845/CRTC6845.hpp b/Components/6845/CRTC6845.hpp
index 0f3d1e768..1181c6cb1 100644
--- a/Components/6845/CRTC6845.hpp
+++ b/Components/6845/CRTC6845.hpp
@@ -58,15 +58,14 @@ template <class T> class CRTC6845 {
 					if(hsync_down_counter_) bus_state_.hsync = true;
 				}
 
+				// update refresh address
+				if(character_is_visible_) {
+					bus_state_.refresh_address++;
+				}
+
 				// check for end of visible characters
 				if(character_counter_ == registers_[1]) {
-					bus_state_.refresh_address++;
 					character_is_visible_ = false;
-				} else {
-					// update refresh address
-					if(character_is_visible_) {
-						bus_state_.refresh_address++;
-					}
 				}
 
 				// check for end-of-line