diff --git a/.changeset/popular-toys-cough.md b/.changeset/popular-toys-cough.md
new file mode 100644
index 000000000..8e5ca7591
--- /dev/null
+++ b/.changeset/popular-toys-cough.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Fix #340, fixing behavior of content after an expression inside of <select>
diff --git a/internal/parser.go b/internal/parser.go
index 368933c5d..26b1fafa8 100644
--- a/internal/parser.go
+++ b/internal/parser.go
@@ -2156,6 +2156,8 @@ func inSelectIM(p *parser) bool {
 			p.tokenizer.NextIsNotRawText()
 			// Ignore the token.
 			return true
+		default:
+			return inBodyIM(p)
 		}
 	case EndTagToken:
 		switch p.tok.DataAtom {
@@ -2195,7 +2197,7 @@ func inSelectIM(p *parser) bool {
 	case EndExpressionToken:
 		p.addLoc()
 		p.oe.pop()
-		return true
+		return inBodyIM(p)
 	case DoctypeToken:
 		// Ignore the token.
 		return true
diff --git a/internal/printer/printer_test.go b/internal/printer/printer_test.go
index d9f580b71..2eefb2bfb 100644
--- a/internal/printer/printer_test.go
+++ b/internal/printer/printer_test.go
@@ -1434,6 +1434,13 @@ const value = 'test';
 				code:        `<select>${value && $$render` + BACKTICK + `<option>${value}</option>` + BACKTICK + `}</select>`,
 			},
 		},
+		{
+			name:   "select map expression",
+			source: `<select>{[1, 2, 3].map(num => <option>{num}</option>)}</select><div>Hello world!</div>`,
+			want: want{
+				code: `<select>${[1, 2, 3].map(num => $$render` + BACKTICK + `<option>${num}</option>` + BACKTICK + `)}</select><div>Hello world!</div>`,
+			},
+		},
 		{
 			name: "textarea",
 			source: `---
diff --git a/internal/token_test.go b/internal/token_test.go
index 69edbc99a..87ee69e57 100644
--- a/internal/token_test.go
+++ b/internal/token_test.go
@@ -336,6 +336,11 @@ func TestBasic(t *testing.T) {
 			`<Fragment>foo</Fragment>`,
 			[]TokenType{StartTagToken, TextToken, EndTagToken},
 		},
+		{
+			"select with expression",
+			`<select>{[1, 2, 3].map(num => <option>{num}</option>)}</select>`,
+			[]TokenType{StartTagToken, StartExpressionToken, TextToken, StartTagToken, StartExpressionToken, TextToken, EndExpressionToken, EndTagToken, TextToken, EndExpressionToken, EndTagToken},
+		},
 		{
 			"Markdown codeblock",
 			fmt.Sprintf(`<Markdown>