diff --git a/src/core/composer/qgscomposerattributetable.cpp b/src/core/composer/qgscomposerattributetable.cpp
index 124f2369a11..7824a7cd732 100755
--- a/src/core/composer/qgscomposerattributetable.cpp
+++ b/src/core/composer/qgscomposerattributetable.cpp
@@ -463,6 +463,8 @@ bool QgsComposerAttributeTable::getFeatureAttributes( QList<QgsAttributeMap> &at
     c.setAscending( sortColumns.at( i ).second );
     qStableSort( attributeMaps.begin(), attributeMaps.end(), c );
   }
+
+  adjustFrameToSize();
   return true;
 }
 
@@ -485,22 +487,10 @@ void QgsComposerAttributeTable::setSceneRect( const QRectF& rectangle )
   //update rect for data defined size and position
   QRectF evaluatedRect = evalItemRect( rectangle );
 
-  double titleHeight =  2 * mGridStrokeWidth + 2 * mLineTextDistance + QgsComposerUtils::fontAscentMM( mHeaderFont );
-  double attributeHeight = mGridStrokeWidth + 2 * mLineTextDistance + QgsComposerUtils::fontAscentMM( mContentFont );
-  if (( evaluatedRect.height() - titleHeight ) > 0 )
-  {
-    mMaximumNumberOfFeatures = ( evaluatedRect.height() - titleHeight ) / attributeHeight;
-  }
-  else
-  {
-    mMaximumNumberOfFeatures = 0;
-  }
   QgsComposerItem::setSceneRect( evaluatedRect );
 
   //refresh table attributes, since number of features has likely changed
   refreshAttributes();
-
-  emit maximumNumberOfFeaturesChanged( mMaximumNumberOfFeatures );
 }
 
 void QgsComposerAttributeTable::setSortAttributes( const QList<QPair<int, bool> > att )