--- a/tuikit/core/window.py	Mon Mar 17 20:40:04 2014 +0100
+++ b/tuikit/core/window.py	Mon Mar 17 23:44:18 2014 +0100
@@ -1,8 +1,9 @@
 from tuikit.core.buffer import Buffer
 from tuikit.core.signal import Signal
+from tuikit.core.container import Container
 
 
-class Window:
+class Window(Container):
 
     """Window is rectangular part of screen containing widgets.
 
@@ -13,6 +14,7 @@
     def __init__(self, buffer=None):
         """New buffer for the window will be created unless given existing
         `buffer` as parameter."""
+        Container.__init__(self)
         self._buffer = None
         self._size = None
         self.sig_resized = Signal()
@@ -43,4 +45,5 @@
 
     def draw(self, buffer, x=0, y=0):
         """Draw this window into buffer at x, y coords."""
+        Container.draw(self, self.buffer)
         buffer.draw(self.buffer, x, y)