diff --git a/app/dialogs/convert-precision-dialog.c b/app/dialogs/convert-precision-dialog.c
index 3351d21f00..5029d13824 100644
--- a/app/dialogs/convert-precision-dialog.c
+++ b/app/dialogs/convert-precision-dialog.c
@@ -127,16 +127,18 @@ convert_precision_dialog_new (GimpImage                    *image,
       linear = FALSE;
       break;
 
+      /* leave gamma alone by default when converting to 16/32 bit float */
     case GIMP_COMPONENT_TYPE_U16:
     case GIMP_COMPONENT_TYPE_U32:
-    case GIMP_COMPONENT_TYPE_HALF:
     default:
       linear = gimp_babl_format_get_linear (old_format);
       break;
 
     case GIMP_COMPONENT_TYPE_FLOAT:
+    case GIMP_COMPONENT_TYPE_HALF:
     case GIMP_COMPONENT_TYPE_DOUBLE:
-      /* default to linear when converting to float or double */
+      /* default to linear when converting to half, single or double precision
+       * floating point */
       linear = TRUE;
       break;
     }
diff --git a/app/widgets/gimptemplateeditor.c b/app/widgets/gimptemplateeditor.c
index 8df21a978f..85ed57a21c 100644
--- a/app/widgets/gimptemplateeditor.c
+++ b/app/widgets/gimptemplateeditor.c
@@ -659,12 +659,12 @@ gimp_template_editor_precision_changed (GtkWidget          *widget,
 
     case GIMP_COMPONENT_TYPE_U16:
     case GIMP_COMPONENT_TYPE_U32:
-    case GIMP_COMPONENT_TYPE_HALF:
     default:
       /* leave 'linear' alone */
       break;
 
     case GIMP_COMPONENT_TYPE_FLOAT:
+    case GIMP_COMPONENT_TYPE_HALF:
     case GIMP_COMPONENT_TYPE_DOUBLE:
       /* default to linear when converting to float or double */
       g_object_set (private->template,