diff --git a/qrenderdoc/Code/BufferFormatter.cpp b/qrenderdoc/Code/BufferFormatter.cpp
index 2353a848a..b7f7e06f1 100644
--- a/qrenderdoc/Code/BufferFormatter.cpp
+++ b/qrenderdoc/Code/BufferFormatter.cpp
@@ -2737,7 +2737,7 @@ QString BufferFormatter::DeclareStruct(Packing::Rules pack, ResourceId shader,
   QString ret;
 
   // don't declare outer struct for scalar-wrapped structs (generated by 'float *foo' type declarations)
-  if(!name.isEmpty() && members.size() == 1)
+  if(!name.isEmpty() || members.size() != 1)
     ret = lit("struct %1\n{\n").arg(MakeIdentifierName(name));
 
   ret += innerSkippedPrefixString;
@@ -2892,7 +2892,7 @@ QString BufferFormatter::DeclareStruct(Packing::Rules pack, ResourceId shader,
   }
 
   // don't declare outer struct for scalar-wrapped structs (generated by 'float *foo' type declarations)
-  if(!name.isEmpty() && members.size() == 1)
+  if(!name.isEmpty() || members.size() != 1)
     ret += lit("}\n");
 
   return declarations + ret;