diff --git a/components/Frame.qml b/components/Frame.qml
index 450316889236ad0638805949cd1bcac426c3172d..8233c455e96675fefa9b4c4c754715e507f18a2a 100644
--- a/components/Frame.qml
+++ b/components/Frame.qml
@@ -1,24 +1,21 @@
 import QtQuick 1.0
 import "custom" as Components
-
-
-QStyleBackground {
-
-    width: 100
-    height: 100
-
+Item {
     default property alias children: content.children
-
-    style: QStyleItem {
-        id: styleitem
-        elementType: "frame"
-    }
-
-    Item {
-        id: content
+    width: Math.max(100, content.childrenRect.width + 2 * content.frameWidth)
+    height: Math.max(100, content.childrenRect.height + 2 * content.frameWidth)
+    property alias raised: style.raised
+    property alias sunken: style.sunken
+    QStyleItem {
+        id: style
         anchors.fill: parent
-        anchors.margins: frameWidth
-        property int frameWidth: styleitem.pixelMetric("defaultframewidth");
+        elementType: "frame"
+        Item {
+            id: content
+            anchors.fill: parent
+            anchors.margins: frameWidth
+            property int frameWidth: styleitem.pixelMetric("defaultframewidth");
+        }
     }
 }
 
diff --git a/components/qmldir b/components/qmldir
index 3aaf43475f7abd8352fbcc4404a464dea08dbc47..ae9e9eff9aaa7146da5e4113c23e5405765d8ed5 100644
--- a/components/qmldir
+++ b/components/qmldir
@@ -6,6 +6,7 @@ ToolBar 0.1 ToolBar.qml
 TabFrame 0.1 TabFrame.qml
 TabBar 0.1 TabBar.qml
 Tab 0.1 Tab.qml
+Frame 0.1 Frame.qml
 ScrollArea 0.1 ScrollArea.qml
 ScrollBar 0.1 ScrollBar.qml
 ChoiceList 0.1 ChoiceList.qml