diff --git a/libgimp/gimpexportoptions.c b/libgimp/gimpexportoptions.c
index f43d32c7d1..78f3e3b413 100644
--- a/libgimp/gimpexportoptions.c
+++ b/libgimp/gimpexportoptions.c
@@ -50,9 +50,15 @@ static void
 export_merge (GimpImage  *image,
               GList     **drawables)
 {
-  GList  *layers;
-  GList  *iter;
-  gint32  nvisible = 0;
+  GList     *layers;
+  GList     *iter;
+  GimpLayer *floating_sel;
+  gint32     nvisible = 0;
+
+  /* Convert floating selection to layer if it exists */
+  floating_sel = gimp_image_get_floating_sel (image);
+  if (floating_sel)
+    gimp_floating_sel_to_layer (floating_sel);
 
   layers = gimp_image_list_layers (image);