diff --git a/demos/misc/window_management/control.gd b/demos/misc/window_management/control.gd
new file mode 100644
index 0000000000..3e74f24e42
--- /dev/null
+++ b/demos/misc/window_management/control.gd
@@ -0,0 +1,39 @@
+
+extends Control
+
+func _fixed_process(delta):
+	if(OS.is_fullscreen()):
+		get_node("Label_Fullscreen").set_text("Mode:\nFullscreen")
+	else:
+		get_node("Label_Fullscreen").set_text("Mode:\nWindowed")
+	
+	get_node("Label_Position").set_text( str("Position:\n", OS.get_window_position() ) )
+	
+	get_node("Label_Size").set_text(str("Size:\n", OS.get_window_size() ) )
+	
+	get_node("Label_Screen_Count").set_text( str("Screens:\n", OS.get_screen_count() ) )
+	
+	get_node("Label_Screen0_Resolution").set_text( str("Screen0 Resolution:\n", OS.get_screen_size() ) )
+	
+	if(OS.get_screen_count() > 1):
+		get_node("Label_Screen1_Resolution").show()
+		get_node("Label_Screen1_Resolution").set_text( str("Screen0 Resolution:\n", OS.get_screen_size(1) ) )
+
+
+func _ready():
+	set_fixed_process(true)
+
+
+func _on_Fullscreen_toggled( pressed ):
+	if(pressed):
+		OS.set_fullscreen(true)
+	else:
+		OS.set_fullscreen(false)
+
+
+func _on_Button_MoveTo_pressed():
+	OS.set_window_position( Vector2(100,100) )
+
+
+func _on_Button_Resize_pressed():
+	OS.set_window_size( Vector2(1024,768) )
diff --git a/demos/misc/window_management/engine.cfg b/demos/misc/window_management/engine.cfg
new file mode 100644
index 0000000000..7b6dddce96
--- /dev/null
+++ b/demos/misc/window_management/engine.cfg
@@ -0,0 +1,5 @@
+[application]
+
+name="window_management"
+main_scene="res://window_management.scn"
+icon="icon.png"
diff --git a/demos/misc/window_management/icon.png b/demos/misc/window_management/icon.png
new file mode 100644
index 0000000000..0c422e37b0
Binary files /dev/null and b/demos/misc/window_management/icon.png differ
diff --git a/demos/misc/window_management/icon.png.flags b/demos/misc/window_management/icon.png.flags
new file mode 100644
index 0000000000..5130fd1aab
--- /dev/null
+++ b/demos/misc/window_management/icon.png.flags
@@ -0,0 +1 @@
+gen_mipmaps=false
diff --git a/demos/misc/window_management/window_management.scn b/demos/misc/window_management/window_management.scn
new file mode 100644
index 0000000000..6eaf62ff9f
Binary files /dev/null and b/demos/misc/window_management/window_management.scn differ