diff --git a/src/gui/attributetable/qgsattributetableview.cpp b/src/gui/attributetable/qgsattributetableview.cpp
@@ -26,8 +26,9 @@
 #include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"
 #include "qgslogger.h"
+#include "qgsmapcanvas.h"
 
-QgsAttributeTableView::QgsAttributeTableView( QWidget* parent )
+QgsAttributeTableView::QgsAttributeTableView( QWidget *parent )
     : QTableView( parent ), mModel( 0 ), mFilterModel( 0 ), mActionPopup( 0 )
 {
   QSettings settings;
@@ -43,15 +44,15 @@ QgsAttributeTableView::QgsAttributeTableView( QWidget* parent )
   setSortingEnabled( true );
 }
 
-void QgsAttributeTableView::setLayer( QgsVectorLayer* layer )
+void QgsAttributeTableView::setCanvasAndLayer( QgsMapCanvas *canvas, QgsVectorLayer *layer )
 {
-  if ( layer == NULL )
+  if ( !layer )
   {
-    setModel( NULL );
+    setModel( 0 );
     delete mModel;
-    mModel = NULL;
+    mModel = 0;
     delete mFilterModel;
-    mFilterModel = NULL;
+    mFilterModel = 0;
     return;
   }
 
@@ -65,16 +66,14 @@ void QgsAttributeTableView::setLayer( QgsVectorLayer* layer )
   if ( layer->dataProvider()->capabilities() & QgsVectorDataProvider::SelectAtId )
   {
     QgsDebugMsg( "SelectAtId supported" );
-    mModel = new QgsAttributeTableModel( layer );
+    mModel = new QgsAttributeTableModel( canvas, layer );
   }
   else
   {
     QgsDebugMsg( "SelectAtId NOT supported" );
-    mModel = new QgsAttributeTableMemoryModel( layer );
+    mModel = new QgsAttributeTableMemoryModel( canvas, layer );
   }
 
-  mModel->loadLayer();
-
   mFilterModel = new QgsAttributeTableFilterModel( layer );
   mFilterModel->setSourceModel( mModel );
   setModel( mFilterModel );

diff --git a/src/gui/attributetable/qgsattributetableview.h b/src/gui/attributetable/qgsattributetableview.h
@@ -22,23 +22,25 @@
 class QgsAttributeTableModel;
 class QgsAttributeTableFilterModel;
 
+class QgsMapCanvas;
 class QgsVectorLayer;
 class QMenu;
-
+class QProgressDialog;
 
 class GUI_EXPORT QgsAttributeTableView : public QTableView
 {
     Q_OBJECT
 
   public:
-    QgsAttributeTableView( QWidget* parent = NULL );
+    QgsAttributeTableView( QWidget* parent = 0 );
     virtual ~QgsAttributeTableView();
 
     /**
      * Sets the layer
+     * @param canvas canvas pointer
      * @param layer layer pointer
      */
-    void setLayer( QgsVectorLayer* layer );
+    void setCanvasAndLayer( QgsMapCanvas *canvas, QgsVectorLayer *layer );
 
     /**
      * Saves geometry to the settings on close
@@ -52,6 +54,7 @@ class GUI_EXPORT QgsAttributeTableView : public QTableView
     void willShowContextMenu( QMenu* menu, QModelIndex atIndex );
 
   private:
+    QgsMapCanvas *mCanvas;
     QgsAttributeTableModel* mModel;
     QgsAttributeTableFilterModel* mFilterModel;
     QMenu *mActionPopup;