diff --git a/lib/generators.nix b/lib/generators.nix
index 0b8393e8ebe2..9361404a5a0e 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -381,15 +381,17 @@ rec {
   toGitINI =
     let
       mkSectionName =
+        let
+          containsQuote = hasInfix ''"'';
+        in
         name:
         let
-          containsQuote = hasInfix ''"'' name;
           sections = splitString "." name;
-          section = head sections;
-          subsections = tail sections;
-          subsection = concatStringsSep "." subsections;
         in
-        if containsQuote || subsections == [ ] then name else ''${section} "${subsection}"'';
+        if containsQuote name || length sections == 1 then
+          name
+        else
+          ''${head sections} "${concatStringsSep "." (tail sections)}"'';
 
       mkValueString =
         v: