diff --git a/command/pr_create.go b/command/pr_create.go
index 29762de0b..9a6e165ee 100644
--- a/command/pr_create.go
+++ b/command/pr_create.go
@@ -208,8 +208,9 @@ func prCreate(cmd *cobra.Command, _ []string) error {
 		Milestone: milestoneTitle,
 	}
 
-	// TODO: only drop into interactive mode if stdin & stdout are a tty
-	if !isWeb && !autofill && (title == "" || body == "") {
+	interactive := !(cmd.Flags().Changed("title") && cmd.Flags().Changed("body"))
+
+	if !isWeb && !autofill && interactive {
 		var templateFiles []string
 		if rootDir, err := git.ToplevelDir(); err == nil {
 			// TODO: figure out how to stub this in tests