diff --git a/app-android/res/values/strings.xml b/app-android/res/values/strings.xml
index 18e81d5..0ec9671 100644
--- a/app-android/res/values/strings.xml
+++ b/app-android/res/values/strings.xml
@@ -5,6 +5,7 @@
     <string name="menu_settings">Settings</string>
     <string name="preferences_host_title">Network host</string>
     <string name="stylus_preference">Sense stylus only</string>
+    <string name="fullscreen_preference">Fullscreen</string>
     <string name="menu_about">About / Help</string>
 
 </resources>
diff --git a/app-android/res/xml/drawing_preferences.xml b/app-android/res/xml/drawing_preferences.xml
index 586f244..8ea8f03 100644
--- a/app-android/res/xml/drawing_preferences.xml
+++ b/app-android/res/xml/drawing_preferences.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
     <CheckBoxPreference android:title="@string/stylus_preference" android:key="stylus_only_preference" android:defaultValue="false"/>
+    <CheckBoxPreference android:title="@string/fullscreen_preference" android:key="fullscreen_preference" android:defaultValue="true"/>
 </PreferenceScreen>
diff --git a/app-android/src/at/bitfire/gfxtablet/CanvasActivity.java b/app-android/src/at/bitfire/gfxtablet/CanvasActivity.java
index ad7d164..2e74b52 100644
--- a/app-android/src/at/bitfire/gfxtablet/CanvasActivity.java
+++ b/app-android/src/at/bitfire/gfxtablet/CanvasActivity.java
@@ -16,7 +16,7 @@ import android.widget.LinearLayout;
 
 public class CanvasActivity extends Activity {
 	CanvasView canvas;
-	SharedPreferences prefs;
+	SharedPreferences settings;
 	NetworkClient netClient;
 	
 	@Override
@@ -26,9 +26,12 @@ public class CanvasActivity extends Activity {
 		PreferenceManager.setDefaultValues(this, R.xml.network_preferences, false);
 		PreferenceManager.setDefaultValues(this, R.xml.drawing_preferences, false);
 		
-		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
-		this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-				WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		settings = PreferenceManager.getDefaultSharedPreferences(this);
+		if (settings.getBoolean(SettingsActivity.KEY_PREF_FULLSCREEN, true)) {
+			this.requestWindowFeature(Window.FEATURE_NO_TITLE);
+			this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+					WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		}
 		
 		setContentView(R.layout.activity_canvas);
 		LinearLayout layout = (LinearLayout)findViewById(R.id.canvas_layout);
diff --git a/app-android/src/at/bitfire/gfxtablet/SettingsActivity.java b/app-android/src/at/bitfire/gfxtablet/SettingsActivity.java
index ff6c668..e6e7510 100644
--- a/app-android/src/at/bitfire/gfxtablet/SettingsActivity.java
+++ b/app-android/src/at/bitfire/gfxtablet/SettingsActivity.java
@@ -12,7 +12,8 @@ import at.bitfire.gfxtablet.R;
 public class SettingsActivity extends PreferenceActivity {
     public static final String
 		KEY_PREF_HOST = "host_preference",
-		KEY_PREF_STYLUS_ONLY = "stylus_only_preference";
+		KEY_PREF_STYLUS_ONLY = "stylus_only_preference",
+		KEY_PREF_FULLSCREEN = "fullscreen_preference";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {