diff --git a/markdownify/__init__.py b/markdownify/__init__.py
index 151a222..a60400c 100644
--- a/markdownify/__init__.py
+++ b/markdownify/__init__.py
@@ -265,7 +265,7 @@ class MarkdownConverter(object):
             return text
 
         style = self.options['heading_style'].lower()
-        text = text.rstrip()
+        text = text.strip()
         if style == UNDERLINED and n <= 2:
             line = '=' if n == 1 else '-'
             return self.underline(text, line)
diff --git a/tests/test_conversions.py b/tests/test_conversions.py
index 5c6ec06..b03c874 100644
--- a/tests/test_conversions.py
+++ b/tests/test_conversions.py
@@ -90,6 +90,14 @@ def test_em():
     inline_tests('em', '*')
 
 
+def test_header_with_space():
+    assert md('<h3>\n\nHello</h3>') == '### Hello\n\n'
+    assert md('<h4>\n\nHello</h4>') == '#### Hello\n\n'
+    assert md('<h5>\n\nHello</h5>') == '##### Hello\n\n'
+    assert md('<h5>\n\nHello\n\n</h5>') == '##### Hello\n\n'
+    assert md('<h5>\n\nHello   \n\n</h5>') == '##### Hello\n\n'
+
+
 def test_h1():
     assert md('<h1>Hello</h1>') == 'Hello\n=====\n\n'