diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CIndenterTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CIndenterTest.java
index 52fac36670d..e1389e636aa 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CIndenterTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CIndenterTest.java
@@ -432,7 +432,7 @@ public class CIndenterTest extends BaseUITestCase {
 	//class MyClass {
 	//typedef int MyType;
 	//public:
-	//int getA() {
+	//virtual int getA() {
 	//return a;
 	//}
 	//MyClass();
@@ -444,7 +444,7 @@ public class CIndenterTest extends BaseUITestCase {
 	//class MyClass {
 	//		typedef int MyType;
 	//	public:
-	//		int getA() {
+	//		virtual int getA() {
 	//			return a;
 	//		}
 	//		MyClass();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CIndenter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CIndenter.java
index cb08370dc4e..14fe12bf58d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CIndenter.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CIndenter.java
@@ -1409,8 +1409,17 @@ public final class CIndenter {
 				case Symbols.TokenPRIVATE:
 				case Symbols.TokenPROTECTED:
 				case Symbols.TokenPUBLIC:
-				case Symbols.TokenVIRTUAL:
 					continue; // Don't stop at colon in a class declaration
+
+				case Symbols.TokenVIRTUAL:
+					switch (peekToken()) {
+					case Symbols.TokenPRIVATE:
+					case Symbols.TokenPROTECTED:
+					case Symbols.TokenPUBLIC:
+						break;
+					default:
+						continue;
+					}
 				}
 				int pos= fPreviousPos;
 				if (!isConditional())