diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
index 1791ccfac..61ce55fa9 100644
--- a/app/Http/Controllers/SettingController.php
+++ b/app/Http/Controllers/SettingController.php
@@ -15,7 +15,14 @@ class SettingController extends Controller
     {
         $this->checkPermission('settings-manage');
         $this->setPageTitle('Settings');
-        return view('settings/index');
+
+        // Get application version
+        $version = false;
+        if (function_exists('exec')) {
+            $version = exec('git describe --always --tags ');
+        }
+
+        return view('settings/index', ['version' => $version]);
     }
 
     /**
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index ce7a8d5d1..ad0b6cbfb 100644
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -4,11 +4,11 @@
 
     @include('settings/navbar', ['selected' => 'settings'])
 
-<div class="container small">
+<div class="container small settings-container">
 
     <h1>Settings</h1>
 
-    <form action="/settings" method="POST">
+    <form action="/settings" method="POST" ng-cloak>
         {!! csrf_field() !!}
 
         <h3>App Settings</h3>
@@ -94,6 +94,9 @@
         <hr class="margin-top">
 
         <div class="form-group">
+            <span class="float right muted">
+                BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }}
+            </span>
             <button type="submit" class="button pos">Save Settings</button>
         </div>
     </form>