diff --git a/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp b/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp
index 3bf04076ea..d8be2abe0d 100644
--- a/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp
+++ b/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp
@@ -794,7 +794,7 @@ MainWindow::~MainWindow()
     m_pdmUiTreeView->setPdmItem(nullptr);
     m_pdmUiTreeView2->setPdmItem(nullptr);
     m_pdmUiPropertyView->showProperties(nullptr);
-    m_pdmUiTableView->setUiFieldHandle(nullptr);
+    m_pdmUiTableView->setChildArrayField(nullptr);
 
     delete m_pdmUiTreeView;
     delete m_pdmUiTreeView2;
@@ -975,11 +975,12 @@ void MainWindow::slotShowTableView()
             if (!childArrayFieldHandle->hasSameFieldCountForAllObjects())
             {
                 uiFieldHandle = nullptr;
+                childArrayFieldHandle = nullptr;
             }
         }
     }
 
-    m_pdmUiTableView->setUiFieldHandle(uiFieldHandle);
+    m_pdmUiTableView->setChildArrayField(childArrayFieldHandle);
 
     if (uiFieldHandle)
     {
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.cpp
index 8bd42233d8..6d5901c29d 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.cpp
@@ -37,6 +37,7 @@
 
 #include "cafPdmUiTableView.h"
 
+#include "cafPdmChildArrayField.h"
 #include "cafPdmObject.h"
 #include "cafPdmUiTableViewEditor.h"
 
@@ -83,11 +84,18 @@ PdmUiTableView::~PdmUiTableView()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void PdmUiTableView::setUiFieldHandle(PdmUiFieldHandle* uiFieldHandle)
+void PdmUiTableView::setChildArrayField(PdmChildArrayFieldHandle* childArrayField)
 {
     CAF_ASSERT(m_listViewEditor);
 
-    m_listViewEditor->setField(uiFieldHandle);
+    if (childArrayField)
+    {
+        m_listViewEditor->setField(childArrayField->uiCapability());
+    }
+    else
+    {
+        m_listViewEditor->setField(nullptr);
+    }
 
     // SIG_CAF_HACK
     m_listViewEditor->updateUi(m_uiConfigName);
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.h
index b27183cdcb..315543456e 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.h
@@ -84,7 +84,7 @@ public:
     // SIG_CAF_HACK
     void        setUiConfigurationName(QString uiConfigName);
 
-    void        setUiFieldHandle(PdmUiFieldHandle* uiFieldHandle);
+    void        setChildArrayField(PdmChildArrayFieldHandle* childArrayField);
 
     void        enableDefaultContextMenu(bool enable);
     void        enableHeaderText(bool enable);