diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index c1cbaec649d..549440fc004 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -206,6 +206,14 @@
deconstruct(FALSE)
M.visible_message("[M] smashes through [src]!", "You smash through [src].", "You hear glass breaking.")
+/obj/structure/window/handle_basic_attack(mob/living/basic/attacker, modifiers)
+ if(!can_be_reached(attacker))
+ return
+ . = ..()
+ if(. && attacker.environment_smash >= env_smash_level)
+ deconstruct(FALSE)
+ attacker.visible_message("[attacker] smashes through [src]!", "You smash through [src].", "You hear glass breaking.")
+
/obj/structure/window/attackby__legacy__attackchain(obj/item/I, mob/living/user, params)
if(!can_be_reached(user))
return 1 //skip the afterattack