diff --git a/terraform/context.go b/terraform/context.go
index 0570068ef..dd9a5369e 100644
--- a/terraform/context.go
+++ b/terraform/context.go
@@ -572,7 +572,7 @@ func (c *walkContext) inputWalkFn() depgraph.WalkFunc {
 			// Wrap the input into a namespace
 			input := &PrefixUIInput{
 				IdPrefix:    fmt.Sprintf("provider.%s", rn.ID),
-				QueryPrefix: fmt.Sprintf("Provider %s", rn.ID),
+				QueryPrefix: fmt.Sprintf("provider.%s.", rn.ID),
 				UIInput:     c.Context.uiInput,
 			}
 
diff --git a/terraform/ui_input_prefix.go b/terraform/ui_input_prefix.go
index aebd54493..2207d1d0f 100644
--- a/terraform/ui_input_prefix.go
+++ b/terraform/ui_input_prefix.go
@@ -14,6 +14,6 @@ type PrefixUIInput struct {
 
 func (i *PrefixUIInput) Input(opts *InputOpts) (string, error) {
 	opts.Id = fmt.Sprintf("%s.%s", i.IdPrefix, opts.Id)
-	opts.Query = fmt.Sprintf("%s %s", i.QueryPrefix, opts.Query)
+	opts.Query = fmt.Sprintf("%s%s", i.QueryPrefix, opts.Query)
 	return i.UIInput.Input(opts)
 }