diff --git a/src/core/composer/qgscomposerattributetablev2.cpp b/src/core/composer/qgscomposerattributetablev2.cpp
index 080512e586f..3a96473ec48 100644
--- a/src/core/composer/qgscomposerattributetablev2.cpp
+++ b/src/core/composer/qgscomposerattributetablev2.cpp
@@ -582,6 +582,7 @@ void QgsComposerAttributeTableV2::addFrame( QgsComposerFrame *frame, bool recalc
 
   if ( recalcFrameSizes )
   {
+
     recalculateFrameSizes();
   }
 }
diff --git a/src/core/composer/qgscomposermultiframe.h b/src/core/composer/qgscomposermultiframe.h
index 09635988217..5173d86c32a 100644
--- a/src/core/composer/qgscomposermultiframe.h
+++ b/src/core/composer/qgscomposermultiframe.h
@@ -142,7 +142,7 @@ class CORE_EXPORT QgsComposerMultiFrame: public QgsComposerObject
      * this may cause new frames to be added or frames to be removed, in order to fit
      * the current size of the multiframe's content.
      */
-    void recalculateFrameSizes();
+    virtual void recalculateFrameSizes();
 
     /**Forces a recalculation of all the associated frame's scene rectangles. This
      * method is useful for multiframes which implement a minFrameSize() or
diff --git a/src/core/composer/qgscomposertablev2.cpp b/src/core/composer/qgscomposertablev2.cpp
index 72915a4dce6..3ce504c688a 100644
--- a/src/core/composer/qgscomposertablev2.cpp
+++ b/src/core/composer/qgscomposertablev2.cpp
@@ -136,13 +136,6 @@ bool QgsComposerTableV2::readXML( const QDomElement &itemElem, const QDomDocumen
 
 QSizeF QgsComposerTableV2::totalSize() const
 {
-  //TODO - handle multiple cell headers
-  //also check height calculation function
-
-
-
-  //calculate total size
-
   return mTableSize;
 }
 
@@ -526,11 +519,12 @@ void QgsComposerTableV2::refreshAttributes()
   {
     return;
   }
+}
 
-  //since contents have changed, we also need to recalculate the column widths
-  //and size of table
-  //gettablecontents does this!
-// adjustFrameToSize();
+void QgsComposerTableV2::recalculateFrameSizes()
+{
+  mTableSize = QSizeF( totalWidth(), totalHeight() );
+  QgsComposerMultiFrame::recalculateFrameSizes();
 }
 
 bool QgsComposerTableV2::calculateMaxColumnWidths()
@@ -703,8 +697,6 @@ void QgsComposerTableV2::drawVerticalGridLines( QPainter *painter, const QMap<in
 
 void QgsComposerTableV2::adjustFrameToSize()
 {
-  mTableSize = QSizeF( totalWidth(), totalHeight() );
-
   recalculateFrameSizes();
 
   //force recalculation of frame rects, so that they are set to the correct
diff --git a/src/core/composer/qgscomposertablev2.h b/src/core/composer/qgscomposertablev2.h
index 4df1f341175..cda92db1a26 100644
--- a/src/core/composer/qgscomposertablev2.h
+++ b/src/core/composer/qgscomposertablev2.h
@@ -272,6 +272,8 @@ class CORE_EXPORT QgsComposerTableV2: public QgsComposerMultiFrame
     */
     virtual void refreshAttributes();
 
+    void recalculateFrameSizes();
+
   protected:
     /**Margin between cell borders and cell text*/
     double mCellMargin;