diff --git a/editor/svg-editor.css b/editor/svg-editor.css
index 0980bf3a..09f8a456 100644
--- a/editor/svg-editor.css
+++ b/editor/svg-editor.css
@@ -402,6 +402,15 @@ span.zoom_tool {
 	background: #E8E8E8;
 }
 
+#font_family_dropdown li {
+	font-size: 1.4em;
+}
+
+#font_family {
+	margin-left: 5px;
+	margin-right: 0;
+}
+
 #opacity_dropdown li {
 	width: 140px;
 }
diff --git a/editor/svg-editor.html b/editor/svg-editor.html
index ff533c4f..c2845798 100644
--- a/editor/svg-editor.html
+++ b/editor/svg-editor.html
@@ -219,13 +219,19 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
 	<div id="text_panel">
 		<div class="tool_button" id="tool_bold" title="Bold Text [B]"><span></span>B</div>
 		<div class="tool_button" id="tool_italic" title="Italic Text [I]"><span></span>i</div>
-		<select id="font_family" class="text_tool" title="Change Font Family">
-			<option selected="selected" value="serif">serif</option>
-			<option value="sans-serif">sans-serif</option>
-			<option value="cursive">cursive</option>
-			<option value="fantasy">fantasy</option>
-			<option value="monospace">monospace</option>
-		</select>
+		
+		<input id="font_family" class="text_tool" type="text" title="Change Font Family" size="12"/>
+		<div id="font_family_dropdown" class="dropdown">
+			<button></button>
+			<ul>
+				<li style="font-family:serif">Serif</li>
+				<li style="font-family:sans-serif">Sans-serif</li>
+				<li style="font-family:cursive">Cursive</li>
+				<li style="font-family:fantasy">Fantasy</li>
+				<li style="font-family:monospace">Monospace</li>
+			</ul>
+		</div>
+
 		<label id="font_sizeLabel" class="text_tool" for="font_size">size:</label>
 		<input id="font_size" class="text_tool" title="Change Font Size" size="3" value="0" type="text"/>
 		<input id="text" class="text_tool" type="text" title="Change text contents" size="35"/>
diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index 8203d2d0..3dfd9a84 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -594,10 +594,6 @@ function svg_edit_setup() {
 		}
 	});
 
-	$('#font_family').change(function(){
-		svgCanvas.setFontFamily(this.options[this.selectedIndex].value);
-	});
-
 	$('#seg_type').change(function() {
 		svgCanvas.setSegType($(this).val());
 	});
@@ -734,6 +730,12 @@ function svg_edit_setup() {
 		});
 	}
 	
+	addDropDown('#font_family_dropdown', function() {
+		var fam = $(this).text();
+		$('#font_family').val(fam);
+		svgCanvas.setFontFamily(fam);
+	});
+	
 	addDropDown('#opacity_dropdown', function() {
 		if($(this).find('div').length) return;
 		var perc = parseInt($(this).text().split('%')[0]);