diff --git a/scintilla/lexers/LexRegistry.cxx b/scintilla/lexers/LexRegistry.cxx
index fa4ad4d07..f16fcb89f 100644
--- a/scintilla/lexers/LexRegistry.cxx
+++ b/scintilla/lexers/LexRegistry.cxx
@@ -32,7 +32,7 @@
 using namespace Scintilla;
 
 static const char *const RegistryWordListDesc[] = {
-	0
+	nullptr
 };
 
 struct OptionsRegistry {
@@ -79,11 +79,6 @@ class LexerRegistry : public DefaultLexer {
 	}
 
 	static bool AtEndOfLine(LexAccessor& styler, Sci_Position pos) {
-		//char curr;
-		//do {
-		//  curr = styler.SafeGetCharAt(pos, '\0');
-		//  ++pos;
-		//} while (curr == ' ' || curr == '\t');
 		const char curr = styler.SafeGetCharAt(pos, '\0');
 		const char next = styler.SafeGetCharAt(pos+1, '\0');
 		return (!curr || (curr == '\n') || (curr == '\r' && next != '\n'));
@@ -125,13 +120,9 @@ class LexerRegistry : public DefaultLexer {
 	}
 
 	static bool AtKeyPathEnd(LexAccessor& styler, Sci_Position start) {
-		bool atEOL = false;
 		while (!AtEndOfLine(styler, start + 1)) {
-			++start;
-			char curr = styler.SafeGetCharAt(start, '\0');
-			char next = styler.SafeGetCharAt(start+1, '\0');
-			atEOL = (curr == '\r' && next != '\n') || (curr == '\n');
-			if (curr == ']' || !curr) {
+			char curr = styler.SafeGetCharAt(++start, '\0');
+			if (curr == ']') {
 				// There's still at least one or more square brackets ahead
 				return false;
 			}
@@ -193,7 +184,7 @@ public:
 		return -1;
 	}
 	void *SCI_METHOD PrivateCall(int, void *) override {
-		return 0;
+		return nullptr;
 	}
 	static ILexer4 *LexerFactoryRegistry() {
 		return new LexerRegistry;
@@ -223,11 +214,16 @@ void SCI_METHOD LexerRegistry::Lex(Sci_PositionU startPos,
 	StyleContext context(startPos, length, initStyle, styler);
 	bool highlight = true;
 	bool afterEqualSign = false;
+	int stateBefore = SCE_REG_DEFAULT;
+
 	while (context.More() && context.ch) {
 		if (context.atLineStart) {
 			Sci_Position currPos = static_cast<Sci_Position>(context.currentPos);
 			bool continued = styler[currPos-3] == '\\';
 			highlight = continued ? true : false;
+			if (IsKeyPathState(context.state) && !highlight) {
+				context.SetState(SCE_REG_DEFAULT);
+			}
 		}
 		switch (context.state) {
 			case SCE_REG_COMMENT:
@@ -276,8 +272,7 @@ void SCI_METHOD LexerRegistry::Lex(Sci_PositionU startPos,
 			case SCE_REG_DELETEDKEY:
 			case SCE_REG_ADDEDKEY: {
 					Sci_Position currPos = static_cast<Sci_Position>(context.currentPos);
-					//if (context.ch == ']' && AtKeyPathEnd(styler, currPos)) {
-					if (AtEndOfLine(styler, currPos)) {
+					if (context.ch == ']' && AtKeyPathEnd(styler, currPos)) {
 						context.ForwardSetState(SCE_REG_DEFAULT);
 					} else if (context.ch == '{') {
 						if (AtGUID(styler, currPos)) {
@@ -307,9 +302,7 @@ void SCI_METHOD LexerRegistry::Lex(Sci_PositionU startPos,
 					Sci_Position currPos = static_cast<Sci_Position>(context.currentPos);
 					if (context.ch == '"' && IsStringState(context.state)) {
 						context.ForwardSetState(SCE_REG_DEFAULT);
-					//} else if (context.ch == ']' && AtKeyPathEnd(styler, currPos) &&
-					} else if (AtEndOfLine(styler, currPos) &&
-						IsKeyPathState(context.state)) {
+					} else if (context.ch == ']' && AtKeyPathEnd(styler, currPos) && IsKeyPathState(context.state)) {
 						context.ForwardSetState(SCE_REG_DEFAULT);
 					} else if (context.ch == '\\' && IsStringState(context.state)) {
 						beforeEscape = context.state;
@@ -347,11 +340,15 @@ void SCI_METHOD LexerRegistry::Lex(Sci_PositionU startPos,
 			} else if (isxdigit(context.ch & 0xFF) && highlight) {
 				context.SetState(SCE_REG_HEXDIGIT);
 			}
+			else if (context.chPrev == ']' && !IsNextNonWhitespace(styler, currPos-1, ';')) {
+				context.SetState(stateBefore); // continue Reg-Key style for eolfilled
+			}
 			highlight = (context.ch == '@') ? true : highlight;
 			if (setOperators.Contains(context.ch) && highlight) {
 				context.SetState(SCE_REG_OPERATOR);
 			}
 		}
+		stateBefore = context.state;
 		context.Forward();
 	}
 	context.Complete();
diff --git a/src/Edit.c b/src/Edit.c
index a97d79065..e27bf1feb 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -4244,7 +4244,7 @@ void EditJumpTo(HWND hwnd, DocLn iNewLine, DocPos iNewCol)
 //
 void EditFixPositions(HWND hwnd)
 {
-  DocPos iMaxPos     = SciCall_GetTextLength();;
+  DocPos iMaxPos     = SciCall_GetTextLength();
   DocPos iCurrentPos = SciCall_GetCurrentPos();
   DocPos iAnchorPos  = SciCall_GetAnchor();
 
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 2088ec8ab..fe7bf7330 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -3503,10 +3503,8 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
         case SCLEX_AHK:
         case SCLEX_NSIS: // # could also be used instead
         case SCLEX_INNOSETUP:
-          EditToggleLineComments(g_hwndEdit, L";", TRUE);
-          break;
         case SCLEX_REGISTRY:
-          EditToggleLineComments(g_hwndEdit, L";;", TRUE);
+          EditToggleLineComments(g_hwndEdit, L";", TRUE);
           break;
         case SCLEX_SQL:
         case SCLEX_LUA: