diff --git a/powerline/segments/common.py b/powerline/segments/common.py
index f6572ce7..4d4978bd 100644
--- a/powerline/segments/common.py
+++ b/powerline/segments/common.py
@@ -125,6 +125,8 @@ def cwd(pl, segment_info, dir_shorten_len=None, dir_limit_depth=None, use_path_s
 	ret[-1]['highlight_group'] = ['cwd:current_folder', 'cwd']
 	if use_path_separator:
 		ret[-1]['contents'] = ret[-1]['contents'][:-1]
+		if len(ret) > 1 and ret[0]['contents'][0] == os.sep:
+			ret[0]['contents'] = ret[0]['contents'][1:]
 	return ret
 
 
diff --git a/tests/test_segments.py b/tests/test_segments.py
index 1f039981..a3249ac1 100644
--- a/tests/test_segments.py
+++ b/tests/test_segments.py
@@ -161,6 +161,22 @@ class TestCommon(TestCase):
 				{'contents': 'fo/', 'divider_highlight_group': 'cwd:divider', 'draw_inner_divider': False},
 				{'contents': 'bar', 'divider_highlight_group': 'cwd:divider', 'draw_inner_divider': False, 'highlight_group': ['cwd:current_folder', 'cwd']}
 			])
+			cwd[0] = '/etc'
+			self.assertEqual(common.cwd(pl=pl, segment_info=segment_info, use_path_separator=False), [
+				{'contents': '/', 'divider_highlight_group': 'cwd:divider', 'draw_inner_divider': True},
+				{'contents': 'etc', 'divider_highlight_group': 'cwd:divider', 'draw_inner_divider': True, 'highlight_group': ['cwd:current_folder', 'cwd']},
+			])
+			self.assertEqual(common.cwd(pl=pl, segment_info=segment_info, use_path_separator=True), [
+				{'contents': '/', 'divider_highlight_group': 'cwd:divider', 'draw_inner_divider': False},
+				{'contents': 'etc', 'divider_highlight_group': 'cwd:divider', 'draw_inner_divider': False, 'highlight_group': ['cwd:current_folder', 'cwd']},
+			])
+			cwd[0] = '/'
+			self.assertEqual(common.cwd(pl=pl, segment_info=segment_info, use_path_separator=False), [
+				{'contents': '/', 'divider_highlight_group': 'cwd:divider', 'draw_inner_divider': True, 'highlight_group': ['cwd:current_folder', 'cwd']},
+			])
+			self.assertEqual(common.cwd(pl=pl, segment_info=segment_info, use_path_separator=True), [
+				{'contents': '/', 'divider_highlight_group': 'cwd:divider', 'draw_inner_divider': False, 'highlight_group': ['cwd:current_folder', 'cwd']},
+			])
 			ose = OSError()
 			ose.errno = 2
 			cwd[0] = ose