diff --git a/.clang-format b/.clang-format
index 7fcc8c0386..b876be12b0 100644
--- a/.clang-format
+++ b/.clang-format
@@ -12,6 +12,7 @@ BinPackParameters: true
 BraceWrapping:
   BeforeLambdaBody: true
 ColumnLimit: 100
+InsertBraces: true
 # Note that on versions after 4.0 you need to specify
 # SpaceAfterTemplateKeyword: true
 # which is not an option prior to 4.0. Later versions
diff --git a/vtkext/private/module/Testing/TestF3DOpenGLGridMapper.cxx b/vtkext/private/module/Testing/TestF3DOpenGLGridMapper.cxx
index e32cd54ffb..19ce71a0b9 100644
--- a/vtkext/private/module/Testing/TestF3DOpenGLGridMapper.cxx
+++ b/vtkext/private/module/Testing/TestF3DOpenGLGridMapper.cxx
@@ -50,7 +50,9 @@ int TestF3DOpenGLGridMapper(int argc, char* argv[])
     mapper->Print(std::cout);
 
     if (!CheckBounds("default", mapper, -5, +5, -safeMargin, +safeMargin, -5, +5))
+    {
       return EXIT_FAILURE;
+    }
   }
 
   {
@@ -64,15 +66,21 @@ int TestF3DOpenGLGridMapper(int argc, char* argv[])
 
     mapper->SetUpIndex(0);
     if (!CheckBounds("YZ with offset", mapper, -safeMargin, +safeMargin, -r, +r, -r, +r))
+    {
       return EXIT_FAILURE;
+    }
 
     mapper->SetUpIndex(1);
     if (!CheckBounds("XZ with offset", mapper, -r, +r, -safeMargin, +safeMargin, -r, +r))
+    {
       return EXIT_FAILURE;
+    }
 
     mapper->SetUpIndex(2);
     if (!CheckBounds("XY with offset", mapper, -r, +r, -r, +r, -safeMargin, +safeMargin))
+    {
       return EXIT_FAILURE;
+    }
   }
 
   return EXIT_SUCCESS;
diff --git a/vtkext/private/module/vtkF3DImguiConsole.cxx b/vtkext/private/module/vtkF3DImguiConsole.cxx
index 9e5caddabb..8b2126d172 100644
--- a/vtkext/private/module/vtkF3DImguiConsole.cxx
+++ b/vtkext/private/module/vtkF3DImguiConsole.cxx
@@ -117,11 +117,15 @@ void vtkF3DImguiConsole::ShowConsole()
 
       ImGui::TextUnformatted(msg.c_str());
       if (hasColor)
+      {
         ImGui::PopStyleColor();
+      }
     }
 
     if (ImGui::GetScrollY() >= ImGui::GetScrollMaxY())
+    {
       ImGui::SetScrollHereY(1.0f);
+    }
 
     ImGui::PopStyleVar();
   }
diff --git a/vtkext/private/module/vtkF3DRenderer.cxx b/vtkext/private/module/vtkF3DRenderer.cxx
index 8adbddf717..b4fdf57cb5 100644
--- a/vtkext/private/module/vtkF3DRenderer.cxx
+++ b/vtkext/private/module/vtkF3DRenderer.cxx
@@ -618,7 +618,9 @@ void vtkF3DRenderer::ConfigureGridUsingCurrentActors()
       gridMapper->SetSubdivisions(this->GridSubdivisions);
       gridMapper->SetUpIndex(this->UpIndex);
       if (this->GridAbsolute)
+      {
         gridMapper->SetOriginOffset(-gridPos[0], -gridPos[1], -gridPos[2]);
+      }
 
       this->GridActor->GetProperty()->SetColor(this->GridColor);
       this->GridActor->ForceTranslucentOn();
diff --git a/winshellext/F3DShellExtension.cxx b/winshellext/F3DShellExtension.cxx
index 7ad5e36159..3548d795f7 100644
--- a/winshellext/F3DShellExtension.cxx
+++ b/winshellext/F3DShellExtension.cxx
@@ -127,8 +127,7 @@ STDAPI DllRegisterServer()
   }
   // Register the thumbnail handler. The thumbnail handler is associated
   // with the f3d file class.
-  RunOnJSONExtensions(szModuleName,
-    [&](const std::wstring& ext)
+  RunOnJSONExtensions(szModuleName, [&](const std::wstring& ext)
     { hr |= RegisterShellExtThumbnailHandler(ext.c_str(), CLSID_F3DThumbnailProvider); });
 
   if (SUCCEEDED(hr))