diff --git a/src/apps/terminal/TermView.cpp b/src/apps/terminal/TermView.cpp
index b9caedcb36..919b03fee6 100644
--- a/src/apps/terminal/TermView.cpp
+++ b/src/apps/terminal/TermView.cpp
@@ -873,10 +873,10 @@ TermView::SwitchCursorBlinking(bool blinkingOn)
 	} else {
 		// make sure the cursor becomes visible
 		fCursorState = 0;
-		_InvalidateTextRect(fCursor.x, fCursor.y, fCursor.x, fCursor.y);
 		delete fCursorBlinkRunner;
 		fCursorBlinkRunner = NULL;
 	}
+	_InvalidateTextRect(fCursor.x, fCursor.y, fCursor.x, fCursor.y);
 }
 
 
@@ -1235,8 +1235,11 @@ TermView::_DrawCursor()
 
 		if (attr.IsWidth() && fCursorStyle != IBEAM_CURSOR)
 			rect.right += fFontWidth;
-
-		FillRect(rect);
+		if (Window()->IsActive() && IsFocus()) {
+			FillRect(rect);
+		} else {
+			StrokeRect(rect);
+		}
 	}
 }