diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm
index e599c47c9ed..e628dacbd9a 100644
--- a/code/game/objects/structures/flags_banners.dm
+++ b/code/game/objects/structures/flags_banners.dm
@@ -81,10 +81,16 @@
 		shading_icon = new('icons/obj/structure/flags.dmi', "flag")
 		flag_icon.Blend(shading_icon, ICON_MULTIPLY)
 		var/turf/T = get_step(loc, dir)
-		if(!iswall(T))
-			banner_icon = new('icons/obj/structure/flags.dmi', "banner_stand")
-			flag_icon.Blend(banner_icon, ICON_UNDERLAY)
-			verbs += /obj/structure/sign/flag/proc/toggle
+		if(iswall(T))
+			icon = flag_icon
+			return
+		for(var/obj/A in T)
+			if(istype(A, /obj/structure/window))
+				icon = flag_icon
+				return
+		banner_icon = new('icons/obj/structure/flags.dmi', "banner_stand")
+		flag_icon.Blend(banner_icon, ICON_UNDERLAY)
+		verbs += /obj/structure/sign/flag/proc/toggle
 		icon = flag_icon
 
 /obj/item/flag/attack_self(mob/user)
diff --git a/html/changelogs/wezzy_vex_fix.yml b/html/changelogs/wezzy_vex_fix.yml
new file mode 100644
index 00000000000..97df7ee180f
--- /dev/null
+++ b/html/changelogs/wezzy_vex_fix.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Fixes flags on windows."