diff --git a/ui/src/shared/components/flux_functions_toolbar/FluxFunctionsToolbar.tsx b/ui/src/shared/components/flux_functions_toolbar/FluxFunctionsToolbar.tsx
index da96593312..322229a896 100644
--- a/ui/src/shared/components/flux_functions_toolbar/FluxFunctionsToolbar.tsx
+++ b/ui/src/shared/components/flux_functions_toolbar/FluxFunctionsToolbar.tsx
@@ -71,10 +71,14 @@ class FluxFunctionsToolbar extends PureComponent<Props, State> {
     this.setState({searchTerm})
   }
 
-  private handleUpdateScript = (funcExample: string) => {
+  private handleUpdateScript = (funcName: string, funcExample: string) => {
     const {activeQueryText, onSetActiveQueryText} = this.props
 
-    onSetActiveQueryText(`${activeQueryText}\n  |> ${funcExample}`)
+    if (funcName === 'from') {
+      onSetActiveQueryText(`${activeQueryText}\n${funcExample}`)
+    } else {
+      onSetActiveQueryText(`${activeQueryText}\n  |> ${funcExample}`)
+    }
   }
 }
 
diff --git a/ui/src/shared/components/flux_functions_toolbar/FunctionCategory.tsx b/ui/src/shared/components/flux_functions_toolbar/FunctionCategory.tsx
index 8e491d1642..b670c540b8 100644
--- a/ui/src/shared/components/flux_functions_toolbar/FunctionCategory.tsx
+++ b/ui/src/shared/components/flux_functions_toolbar/FunctionCategory.tsx
@@ -10,7 +10,7 @@ import {FluxToolbarFunction} from 'src/types/shared'
 interface Props {
   category: string
   funcs: FluxToolbarFunction[]
-  onClickFunction: (s: string) => void
+  onClickFunction: (name: string, example: string) => void
 }
 
 const FunctionCategory: SFC<Props> = props => {
diff --git a/ui/src/shared/components/flux_functions_toolbar/ToolbarFunction.tsx b/ui/src/shared/components/flux_functions_toolbar/ToolbarFunction.tsx
index e194386a86..da218d4260 100644
--- a/ui/src/shared/components/flux_functions_toolbar/ToolbarFunction.tsx
+++ b/ui/src/shared/components/flux_functions_toolbar/ToolbarFunction.tsx
@@ -9,7 +9,7 @@ import {FluxToolbarFunction} from 'src/types/shared'
 
 interface Props {
   func: FluxToolbarFunction
-  onClickFunction: (s: string) => void
+  onClickFunction: (name: string, example: string) => void
 }
 
 interface State {
@@ -77,7 +77,7 @@ class ToolbarFunction extends PureComponent<Props, State> {
   private handleClickFunction = () => {
     const {func, onClickFunction} = this.props
 
-    onClickFunction(func.example)
+    onClickFunction(func.name, func.example)
   }
 }