diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
index f0acc11a01ff..9497869133d8 100644
--- a/src/gui/attributetable/qgsdualview.cpp
+++ b/src/gui/attributetable/qgsdualview.cpp
@@ -546,6 +546,10 @@ void QgsDualView::updateEditSelectionProgress( int progress, int count )
   mNextFeatureButton->setEnabled( progress + 1 < count );
   mFirstFeatureButton->setEnabled( progress > 0 );
   mLastFeatureButton->setEnabled( progress + 1 < count );
+  if ( mAttributeForm )
+  {
+    mAttributeForm->setVisible( count > 0 );
+  }
 }
 
 void QgsDualView::panOrZoomToFeature( const QgsFeatureIds &featureset )
diff --git a/src/gui/attributetable/qgsfeaturelistview.cpp b/src/gui/attributetable/qgsfeaturelistview.cpp
index 0ccc777040ab..d8019e71858a 100644
--- a/src/gui/attributetable/qgsfeaturelistview.cpp
+++ b/src/gui/attributetable/qgsfeaturelistview.cpp
@@ -177,6 +177,10 @@ void QgsFeatureListView::editSelectionChanged( const QItemSelection &deselected,
       emit currentEditSelectionProgressChanged( mModel->mapFromMaster( indexList.first() ).row(), mModel->rowCount() );
     }
   }
+  else if ( mModel->rowCount() == 0 )
+  {
+    emit currentEditSelectionProgressChanged( 0, 0 );
+  }
 }
 
 void QgsFeatureListView::selectAll()