diff --git a/code/apps/+nansen/@App/App.m b/code/apps/+nansen/@App/App.m
index f470c26e..e1d35dee 100644
--- a/code/apps/+nansen/@App/App.m
+++ b/code/apps/+nansen/@App/App.m
@@ -1395,15 +1395,17 @@ function onMouseDoubleClickedInTable(app, ~, evt)
             end
             
             % Get name of column which was clicked
-            thisColumnName = app.UiMetaTableViewer.getColumnNames(thisCol);
+            [~,thisVariableName] = app.UiMetaTableViewer.getColumnNames(thisCol);
 
             % Use table variable attributes to check if a double click
             % callback function exists for the current table column
             TVA = app.getTableVariableAttributes('HasDoubleClickFunction');
             
-            isMatch = strcmp(thisColumnName, {TVA.Name});
+            isMatch = strcmp(thisVariableName, {TVA.Name}) & ...
+                strcmp(app.UiMetaTableViewer.MetaTableType,[TVA.TableType]);
 
             if any( isMatch )
+
                 tableVariableClassName = TVA(isMatch).ClassName;
                 if isempty(tableVariableClassName); return; end
 
diff --git a/code/apps/+nansen/@MetaTableViewer/MetaTableViewer.m b/code/apps/+nansen/@MetaTableViewer/MetaTableViewer.m
index 5e28e1d2..8772f412 100644
--- a/code/apps/+nansen/@MetaTableViewer/MetaTableViewer.m
+++ b/code/apps/+nansen/@MetaTableViewer/MetaTableViewer.m
@@ -524,16 +524,18 @@ function setSelectedEntries(obj, IND, preventCallback)
             end
         end
     
-        function columnNames = getColumnNames(obj, columnIndices)
+        function [columnNames,variableNames] = getColumnNames(obj, columnIndices)
         % getColumnNames - Get name of column(s) given column indices
             if nargin < 2; columnIndices = []; end
             
-            columnNames = obj.ColumnModel.getColumnNames();
+            [columnNames,variableNames] = obj.ColumnModel.getColumnNames();
             if ~isempty(columnIndices)
                 columnNames = columnNames(columnIndices);
+                variableNames = variableNames(columnIndices);
             end
             if numel(columnNames) == 1 && iscell(columnNames)
                 columnNames = columnNames{1};
+                variableNames = variableNames{1};
             end
         end
     end