diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/ChooseDataTypeAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/ChooseDataTypeAction.java
index da7d0add41..a4f692853d 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/ChooseDataTypeAction.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/ChooseDataTypeAction.java
@@ -116,7 +116,7 @@ public class ChooseDataTypeAction extends DockingAction {
 			}
 
 			VariableStorage storage = var.getVariableStorage();
-			if (storage.isValid()) {
+			if (storage.isValid() && !storage.isStackStorage()) {
 				return storage.size();
 			}
 		}