Index: Core/Common/src/Core.Common.Gui/Commands/GuiExportHandler.cs
===================================================================
diff -u -r2985424cb8bdbf6aa599739a816508d79994b236 -rbc50c464681d2dcf33b307c3daf533d8e7e5faf8
--- Core/Common/src/Core.Common.Gui/Commands/GuiExportHandler.cs	(.../GuiExportHandler.cs)	(revision 2985424cb8bdbf6aa599739a816508d79994b236)
+++ Core/Common/src/Core.Common.Gui/Commands/GuiExportHandler.cs	(.../GuiExportHandler.cs)	(revision bc50c464681d2dcf33b307c3daf533d8e7e5faf8)
@@ -109,12 +109,12 @@
                     selectExportInfoDialog.AddItemType(GetItemName(exportInfo),
                                                        exportInfo.Category,
                                                        exportInfo.Image,
-                                                       null);
+                                                       exportInfo);
                 }
 
                 if (selectExportInfoDialog.ShowDialog() == DialogResult.OK)
                 {
-                    return supportedExportInfos.First(info => info.Name == selectExportInfoDialog.SelectedItemTypeName);
+                    return (ExportInfo) selectExportInfoDialog.SelectedItemTag;
                 }
             }
 
Index: Core/Common/src/Core.Common.Gui/Commands/GuiImportHandler.cs
===================================================================
diff -u -r2985424cb8bdbf6aa599739a816508d79994b236 -rbc50c464681d2dcf33b307c3daf533d8e7e5faf8
--- Core/Common/src/Core.Common.Gui/Commands/GuiImportHandler.cs	(.../GuiImportHandler.cs)	(revision 2985424cb8bdbf6aa599739a816508d79994b236)
+++ Core/Common/src/Core.Common.Gui/Commands/GuiImportHandler.cs	(.../GuiImportHandler.cs)	(revision bc50c464681d2dcf33b307c3daf533d8e7e5faf8)
@@ -123,12 +123,12 @@
                     selectImporterDialog.AddItemType(GetItemName(importInfo),
                                                      importInfo.Category,
                                                      importInfo.Image,
-                                                     null);
+                                                     importInfo);
                 }
 
                 if (selectImporterDialog.ShowDialog() == DialogResult.OK)
                 {
-                    return supportedImportInfos.First(i => i.Name == selectImporterDialog.SelectedItemTypeName);
+                    return (ImportInfo) selectImporterDialog.SelectedItemTag;
                 }
             }