diff --git a/src/index.tsx b/src/index.tsx
index b78984551..1c61e1064 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -29,7 +29,8 @@ import {
   hasStroke,
   getElementAtPosition,
   createScene,
-  getElementContainingPosition
+  getElementContainingPosition,
+  hasText
 } from "./scene";
 
 import { renderScene } from "./renderer";
@@ -324,6 +325,14 @@ export class App extends React.Component<{}, AppState> {
     }
   };
 
+  private redrawBoundingBox = (element: ExcalidrawTextElement) => {
+    const metrics = measureText(element.text, element.font);
+    element.width = metrics.width;
+    element.height = metrics.height;
+    element.baseline = metrics.baseline;
+    this.forceUpdate();
+  }
+
   public render() {
     const canvasWidth = window.innerWidth - CANVAS_WINDOW_OFFSET_LEFT;
     const canvasHeight = window.innerHeight - CANVAS_WINDOW_OFFSET_TOP;
@@ -452,6 +461,60 @@ export class App extends React.Component<{}, AppState> {
               </>
             )}
 
+            {hasText(elements) && (
+              <>
+                <h5>Font size</h5>
+                <ButtonSelect
+                  options={[
+                    { value: 16, text: "16 px" },
+                    { value: 20, text: "20 px" },
+                    { value: 24, text: "24 px" },
+                    { value: 28, text: "28 px" },
+                    { value: 32, text: "32 px" },
+                    { value: 36, text: "36 px" },
+                    { value: 40, text: "40 px" },
+                    { value: 50, text: "50 px" },
+                    { value: 60, text: "60 px" }
+                  ]}
+                  value={getSelectedAttribute(
+                    elements,
+                    element => isTextElement(element) && +element.font.split("px ")[0]
+                  )}
+                  onChange={value =>
+                    this.changeProperty(element => {
+                      if(isTextElement(element)) {
+                        element.font = `${value}px ${element.font.split("px ")[1]}`;
+                        this.redrawBoundingBox(element);
+                      }
+                    })
+                  }
+                />
+                <h5>Font familly</h5>
+                <ButtonSelect 
+                  options={[
+                    {value: "Virgil", text: "Virgil"},
+                    {value: "Arial", text: "Arial"},
+                    {value: "Times New Roman", text: "Times New Roman"},
+                    {value: "Helvetica", text: "Helvetica"},
+                    {value: "Tahoma", text: "Tahoma"},
+                    {value: "Courier", text: "Courier"},
+                  ]}
+                  value={getSelectedAttribute(
+                    elements,
+                    element => isTextElement(element) && element.font.split("px ")[1]
+                  )}
+                  onChange={value =>
+                    this.changeProperty(element => {
+                      if(isTextElement(element)) {
+                        element.font = `${element.font.split("px ")[0]}px ${value}`;
+                        this.redrawBoundingBox(element);
+                      }
+                    })
+                  }
+                />
+              </>
+            )}
+
             <h5>Opacity</h5>
             <input
               type="range"
diff --git a/src/scene/comparisons.ts b/src/scene/comparisons.ts
index a1a3d41d6..14e2ce9dc 100644
--- a/src/scene/comparisons.ts
+++ b/src/scene/comparisons.ts
@@ -21,6 +21,11 @@ export const hasStroke = (elements: ExcalidrawElement[]) =>
         element.type === "arrow")
   );
 
+export const hasText = (elements: ExcalidrawElement[]) =>
+  elements.some(
+    element => element.isSelected && element.type === "text"
+  );
+
 export function getElementAtPosition(
   elements: ExcalidrawElement[],
   x: number,
diff --git a/src/scene/index.ts b/src/scene/index.ts
index 479c60efa..171315f40 100644
--- a/src/scene/index.ts
+++ b/src/scene/index.ts
@@ -18,6 +18,7 @@ export {
   hasBackground,
   hasStroke,
   getElementAtPosition,
-  getElementContainingPosition
+  getElementContainingPosition,
+  hasText
 } from "./comparisons";
 export { createScene } from "./createScene";